Skip to content

Commit 6b8ddeb

Browse files
committed
2025-10-20までの原文変更点反映。
1 parent b9c509f commit 6b8ddeb

File tree

14 files changed

+152
-92
lines changed

14 files changed

+152
-92
lines changed

original-en/billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ public function stripeName(): string|null
612612
}
613613
```
614614

615-
Similarly, you may override the `stripeEmail`, `stripePhone`, `stripeAddress`, and `stripePreferredLocales` methods. These methods will sync information to their corresponding customer parameters when [updating the Stripe customer object](https://stripe.com/docs/api/customers/update). If you wish to take total control over the customer information sync process, you may override the `syncStripeCustomerDetails` method.
615+
Similarly, you may override the `stripeEmail`, `stripePhone` (20 character maximum), `stripeAddress`, and `stripePreferredLocales` methods. These methods will sync information to their corresponding customer parameters when [updating the Stripe customer object](https://stripe.com/docs/api/customers/update). If you wish to take total control over the customer information sync process, you may override the `syncStripeCustomerDetails` method.
616616

617617
<a name="billing-portal"></a>
618618
### Billing Portal

original-en/blade.md

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,20 @@ Since the `@once` directive is often used in conjunction with the `@push` or `@p
640640
@endPushOnce
641641
```
642642

643+
If you are pushing duplicate content from two separate Blade templates, you should provide a unique identifier as the second argument to the `@pushOnce` directive to ensure the content is only rendered once:
644+
645+
```blade
646+
<!-- pie-chart.blade.php -->
647+
@pushOnce('scripts', 'chart.js')
648+
<script src="/chart.js"></script>
649+
@endPushOnce
650+
651+
<!-- line-chart.blade.php -->
652+
@pushOnce('scripts', 'chart.js')
653+
<script src="/chart.js"></script>
654+
@endPushOnce
655+
```
656+
643657
<a name="raw-php"></a>
644658
### Raw PHP
645659

@@ -720,14 +734,6 @@ php artisan make:component Forms/Input
720734

721735
The command above will create an `Input` component in the `app/View/Components/Forms` directory and the view will be placed in the `resources/views/components/forms` directory.
722736

723-
If you would like to create an anonymous component (a component with only a Blade template and no class), you may use the `--view` flag when invoking the `make:component` command:
724-
725-
```shell
726-
php artisan make:component forms.input --view
727-
```
728-
729-
The command above will create a Blade file at `resources/views/components/forms/input.blade.php` which can be rendered as a component via `<x-forms.input />`.
730-
731737
<a name="manually-registering-package-components"></a>
732738
#### Manually Registering Package Components
733739

@@ -1215,6 +1221,7 @@ By default, some keywords are reserved for Blade's internal use in order to rend
12151221

12161222
- `data`
12171223
- `render`
1224+
- `resolve`
12181225
- `resolveView`
12191226
- `shouldRender`
12201227
- `view`
@@ -1453,6 +1460,14 @@ You may use the `.` character to indicate if a component is nested deeper inside
14531460
<x-inputs.button/>
14541461
```
14551462

1463+
To create an anonymous component via Artisan, you may use the `--view` flag when invoking the `make:component` command:
1464+
1465+
```shell
1466+
php artisan make:component forms.input --view
1467+
```
1468+
1469+
The command above will create a Blade file at `resources/views/components/forms/input.blade.php` which can be rendered as a component via `<x-forms.input />`.
1470+
14561471
<a name="anonymous-index-components"></a>
14571472
### Anonymous Index Components
14581473

original-en/controllers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ namespace App\Http\Controllers;
129129
use Illuminate\Routing\Controllers\HasMiddleware;
130130
use Illuminate\Routing\Controllers\Middleware;
131131

132-
class UserController extends Controller implements HasMiddleware
132+
class UserController implements HasMiddleware
133133
{
134134
/**
135135
* Get the middleware that should be assigned to the controller.

original-en/http-client.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,7 @@ Another way of working with concurrent requests in Laravel is to use the `batch`
564564

565565
```php
566566
use Illuminate\Http\Client\Batch;
567+
use Illuminate\Http\Client\ConnectionException;
567568
use Illuminate\Http\Client\RequestException;
568569
use Illuminate\Http\Client\Response;
569570
use Illuminate\Support\Facades\Http;
@@ -578,7 +579,7 @@ $responses = Http::batch(fn (Batch $batch) => [
578579
// An individual request has completed successfully...
579580
})->then(function (Batch $batch, array $results) {
580581
// All requests completed successfully...
581-
})->catch(function (Batch $batch, int|string $key, Response|RequestException $response) {
582+
})->catch(function (Batch $batch, int|string $key, Response|RequestException|ConnectionException $response) {
582583
// First batch request failure detected...
583584
})->finally(function (Batch $batch, array $results) {
584585
// The batch has finished executing...
@@ -621,6 +622,23 @@ $batch->finished();
621622
// Indicates if the batch has request failures...
622623
$batch->hasFailures();
623624
```
625+
<a name="deferring-batches"></a>
626+
#### Deferring Batches
627+
628+
When the `defer` method is invoked, the batch of requests is not executed immediately. Instead, Laravel will execute the batch after the current application request's HTTP response has been sent to the user, keeping your application feeling fast and responsive:
629+
630+
```php
631+
use Illuminate\Http\Client\Batch;
632+
use Illuminate\Support\Facades\Http;
633+
634+
$responses = Http::batch(fn (Batch $batch) => [
635+
$batch->get('http://localhost/first'),
636+
$batch->get('http://localhost/second'),
637+
$batch->get('http://localhost/third'),
638+
])->then(function (Batch $batch, array $results) {
639+
// All requests completed successfully...
640+
})->defer();
641+
```
624642

625643
<a name="macros"></a>
626644
## Macros

original-en/mail.md

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Within your `mail` configuration file, you will find a `mailers` configuration a
4848
<a name="driver-prerequisites"></a>
4949
### Driver / Transport Prerequisites
5050

51-
The API based drivers such as Mailgun, Postmark, Resend, and MailerSend are often simpler and faster than sending mail via SMTP servers. Whenever possible, we recommend that you use one of these drivers.
51+
The API based drivers such as Mailgun, Postmark, and Resend are often simpler and faster than sending mail via SMTP servers. Whenever possible, we recommend that you use one of these drivers.
5252

5353
<a name="mailgun-driver"></a>
5454
#### Mailgun Driver
@@ -208,35 +208,6 @@ If you would like to define [additional options](https://docs.aws.amazon.com/aws
208208
],
209209
```
210210

211-
<a name="mailersend-driver"></a>
212-
#### MailerSend Driver
213-
214-
[MailerSend](https://www.mailersend.com/), a transactional email and SMS service, maintains their own API based mail driver for Laravel. The package containing the driver may be installed via the Composer package manager:
215-
216-
```shell
217-
composer require mailersend/laravel-driver
218-
```
219-
220-
Once the package is installed, add the `MAILERSEND_API_KEY` environment variable to your application's `.env` file. In addition, the `MAIL_MAILER` environment variable should be defined as `mailersend`:
221-
222-
```ini
223-
MAIL_MAILER=mailersend
224-
MAIL_FROM_ADDRESS=app@yourdomain.com
225-
MAIL_FROM_NAME="App Name"
226-
227-
MAILERSEND_API_KEY=your-api-key
228-
```
229-
230-
Finally, add MailerSend to the `mailers` array in your application's `config/mail.php` configuration file:
231-
232-
```php
233-
'mailersend' => [
234-
'transport' => 'mailersend',
235-
],
236-
```
237-
238-
To learn more about MailerSend, including how to use hosted templates, consult the [MailerSend driver documentation](https://github.com/mailersend/mailersend-laravel-driver#usage).
239-
240211
<a name="failover-configuration"></a>
241212
### Failover Configuration
242213

original-en/queues.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
- [Customizing The Queue and Connection](#customizing-the-queue-and-connection)
2222
- [Specifying Max Job Attempts / Timeout Values](#max-job-attempts-and-timeout)
2323
- [SQS FIFO and Fair Queues](#sqs-fifo-and-fair-queues)
24+
- [Queue Failover](#queue-failover)
2425
- [Error Handling](#error-handling)
2526
- [Job Batching](#job-batching)
2627
- [Defining Batchable Jobs](#defining-batchable-jobs)
@@ -1531,6 +1532,31 @@ $invoicePaid = (new InvoicePaid($invoice))
15311532
$user->notify($invoicePaid);
15321533
```
15331534

1535+
<a name="queue-failover"></a>
1536+
### Queue Failover
1537+
1538+
The `failover` queue driver provides automatic failover functionality when pushing jobs to the queue. If the primary queue connection fails for any reason, Laravel will automatically attempt to push the job to the next configured connection in the list. This is particularly useful for ensuring high availability in production environments where queue reliability is critical.
1539+
1540+
To configure a failover queue connection, specify the `failover` driver and provide an array of connection names to attempt in order. By default, Laravel includes an example failover configuration in your application's `config/queue.php` configuration file:
1541+
1542+
```php
1543+
'failover' => [
1544+
'driver' => 'failover',
1545+
'connections' => [
1546+
'database',
1547+
'sync',
1548+
],
1549+
],
1550+
```
1551+
1552+
Once you have configured a connection that uses the `failover` driver, you will probably want to set the failover connection as your default queue connection in your application's `.env` file:
1553+
1554+
```ini
1555+
QUEUE_CONNECTION=failover
1556+
```
1557+
1558+
When a queue connection operation fails and failover is activated, Laravel will dispatch the `Illuminate\Queue\Events\QueueFailedOver` event, allowing you to report or log that a queue connection has failed.
1559+
15341560
<a name="error-handling"></a>
15351561
### Error Handling
15361562

original-en/scout.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class Post extends Model
7171
<a name="queueing"></a>
7272
### Queueing
7373

74-
While not strictly required to use Scout, you should strongly consider configuring a [queue driver](/docs/{{version}}/queues) before using the library. Running a queue worker will allow Scout to queue all operations that sync your model information to your search indexes, providing much better response times for your application's web interface.
74+
When using an engine that is not the `database` or `collection` engine, you should strongly consider configuring a [queue driver](/docs/{{version}}/queues) before using the library. Running a queue worker will allow Scout to queue all operations that sync your model information to your search indexes, providing much better response times for your application's web interface.
7575

7676
Once you have configured a queue driver, set the value of the `queue` option in your `config/scout.php` configuration file to `true`:
7777

@@ -427,7 +427,7 @@ namespace App\Models;
427427

428428
use Illuminate\Database\Eloquent\Model;
429429
use Laravel\Scout\Engines\Engine;
430-
use Laravel\Scout\EngineManager;
430+
use Laravel\Scout\Scout;
431431
use Laravel\Scout\Searchable;
432432

433433
class User extends Model
@@ -439,7 +439,7 @@ class User extends Model
439439
*/
440440
public function searchableUsing(): Engine
441441
{
442-
return app(EngineManager::class)->engine('meilisearch');
442+
return Scout::engine('meilisearch');
443443
}
444444
}
445445
```
@@ -464,7 +464,7 @@ Enabling this feature will also pass the request's IP address and your authentic
464464
> [!WARNING]
465465
> The database engine currently supports MySQL and PostgreSQL.
466466
467-
If your application interacts with small to medium sized databases or has a light workload, you may find it more convenient to get started with Scout's "database" engine. The database engine will use "where like" clauses and full text indexes when filtering results from your existing database to determine the applicable search results for your query.
467+
The `database` engine is the fastest way to get started with Laravel Scout, and uses MySQL / PostgreSQL full-text indexes and "where like" clauses when filtering results from your existing database to determine the applicable search results for your query.
468468

469469
To use the database engine, you may simply set the value of the `SCOUT_DRIVER` environment variable to `database`, or specify the `database` driver directly in your application's `scout` configuration file:
470470

@@ -522,7 +522,7 @@ Once you have specified the collection driver as your preferred driver, you may
522522

523523
On first glance, the "database" and "collections" engines are fairly similar. They both interact directly with your database to retrieve search results. However, the collection engine does not utilize full text indexes or `LIKE` clauses to find matching records. Instead, it pulls all possible records and uses Laravel's `Str::is` helper to determine if the search string exists within the model attribute values.
524524

525-
The collection engine is the most portable search engine as it works across all relational databases supported by Laravel (including SQLite and SQL Server); however, it is less efficient than Scout's database engine.
525+
The collection engine is the most portable search engine as it works across all relational databases supported by Laravel (including SQLite and SQL Server); however, it is much less efficient than Scout's database engine.
526526

527527
<a name="indexing"></a>
528528
## Indexing

translation-ja/billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ public function stripeName(): string|null
612612
}
613613
```
614614

615-
同様に、`stripeEmail``stripePhone``stripeAddress``stripePreferredLocales`メソッドをオーバーライドできます。これらのメソッドは、[Stripe顧客オブジェクトの更新](https://stripe.com/docs/api/customers/update)の際に、対応する顧客パラメータへ情報を同期します。顧客情報の同期プロセスを完全にコントロールしたい場合は、`syncStripeCustomerDetails`メソッドをオーバーライドできます。
615+
同様に、`stripeEmail``stripePhone`(最大20文字)`stripeAddress``stripePreferredLocales`メソッドをオーバーライドできます。これらのメソッドは、[Stripe顧客オブジェクトの更新](https://stripe.com/docs/api/customers/update)の際に、対応する顧客パラメータへ情報を同期します。顧客情報の同期プロセスを完全にコントロールしたい場合は、`syncStripeCustomerDetails`メソッドをオーバーライドできます。
616616

617617
<a name="billing-portal"></a>
618618
### 請求ポータル

translation-ja/blade.md

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,20 @@ Bladeの`@include`ディレクティブを使用すると、別のビュー内
640640
@endPushOnce
641641
```
642642

643+
2つの別々のBladeテンプレートから重複コンテンツをプッシュする場合、コンテンツが一度だけレンダされるように、`@pushOnce`ディレクティブの2番目の引数として一意の識別子を提供する必要があります。
644+
645+
```blade
646+
<!-- pie-chart.blade.php -->
647+
@pushOnce('scripts', 'chart.js')
648+
<script src="/chart.js"></script>
649+
@endPushOnce
650+
651+
<!-- line-chart.blade.php -->
652+
@pushOnce('scripts', 'chart.js')
653+
<script src="/chart.js"></script>
654+
@endPushOnce
655+
```
656+
643657
<a name="raw-php"></a>
644658
### 生PHP
645659

@@ -720,14 +734,6 @@ php artisan make:component Forms/Input
720734

721735
上記のコマンドは、`app/View/Components/Forms`ディレクトリに`Input`コンポーネントを作成し、ビューは`resources/views/components/forms`ディレクトリに配置します。
722736

723-
匿名コンポーネント(Bladeテンプレートのみでクラスを持たないコンポーネント)を作成したい場合は、`make:component`コマンドを実行するとき、`--view`フラグを使用します。
724-
725-
```shell
726-
php artisan make:component forms.input --view
727-
```
728-
729-
上記のコマンドは、`resources/views/components/forms/input.blade.php`へBladeファイルを作成します。このファイルは`<x-forms.input />`により、コンポーネントとしてレンダできます。
730-
731737
<a name="manually-registering-package-components"></a>
732738
#### パッケージコンポーネントの手作業登録
733739

@@ -1215,6 +1221,7 @@ class Alert extends Component
12151221

12161222
- `data`
12171223
- `render`
1224+
- `resolve`
12181225
- `resolveView`
12191226
- `shouldRender`
12201227
- `view`
@@ -1453,6 +1460,14 @@ Bladeは、コンポーネント名のパスカルケースを使い、コンポ
14531460
<x-inputs.button/>
14541461
```
14551462

1463+
Artisanで匿名コンポーネントを作成するには、`make:component`コマンドを実行する際に`--view`フラグを使用します。
1464+
1465+
```shell
1466+
php artisan make:component forms.input --view
1467+
```
1468+
1469+
上記コマンドは、`resources/views/components/forms/input.blade.php`にBladeファイルを作成します。このファイルは `<x-forms.input />`を使い、コンポーネントとしてレンダできます。
1470+
14561471
<a name="anonymous-index-components"></a>
14571472
### 匿名インデックスコンポーネント
14581473

translation-ja/controllers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ namespace App\Http\Controllers;
129129
use Illuminate\Routing\Controllers\HasMiddleware;
130130
use Illuminate\Routing\Controllers\Middleware;
131131

132-
class UserController extends Controller implements HasMiddleware
132+
class UserController implements HasMiddleware
133133
{
134134
/**
135135
* コントローラへ指定するミドルウェアを取得

0 commit comments

Comments
 (0)