Skip to content

Commit 72c0652

Browse files
committed
2025-07-14までの原文変更点反映。
1 parent 26e11f0 commit 72c0652

File tree

17 files changed

+84
-30
lines changed

17 files changed

+84
-30
lines changed

original-en/authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Want to get started fast? Install a [Laravel application starter kit](/docs/{{ve
5555

5656
By default, Laravel includes an `App\Models\User` [Eloquent model](/docs/{{version}}/eloquent) in your `app/Models` directory. This model may be used with the default Eloquent authentication driver.
5757

58-
If your application is not using Eloquent, you may use the `database` authentication provider which uses the Laravel query builder. If your application is using MongoDB, check out MongoDB's official [Laravel user authentication documentation](https://www.mongodb.com/docs/drivers/php/laravel-mongodb/current/user-authentication/) .
58+
If your application is not using Eloquent, you may use the `database` authentication provider which uses the Laravel query builder. If your application is using MongoDB, check out MongoDB's official [Laravel user authentication documentation](https://www.mongodb.com/docs/drivers/php/laravel-mongodb/current/user-authentication/).
5959

6060
When building the database schema for the `App\Models\User` model, make sure the password column is at least 60 characters in length. Of course, the `users` table migration that is included in new Laravel applications already creates a column that exceeds this length.
6161

original-en/helpers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,9 @@ $joined = Arr::join($array, ', ');
666666

667667
// Tailwind, Alpine, Laravel, Livewire
668668

669-
$joined = Arr::join($array, ', ', ' and ');
669+
$joined = Arr::join($array, ', ', ', and ');
670670

671-
// Tailwind, Alpine, Laravel and Livewire
671+
// Tailwind, Alpine, Laravel, and Livewire
672672
```
673673

674674
<a name="method-array-keyby"></a>

original-en/http-client.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Alternatively, the `withQueryParameters` method may be used:
133133
Http::retry(3, 100)->withQueryParameters([
134134
'name' => 'Taylor',
135135
'page' => 1,
136-
])->get('http://example.com/users')
136+
])->get('http://example.com/users');
137137
```
138138

139139
<a name="sending-form-url-encoded-requests"></a>

original-en/localization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ If your placeholder contains all capital letters, or only has its first letter c
207207
<a name="object-replacement-formatting"></a>
208208
#### Object Replacement Formatting
209209

210-
If you attempt to provide an object as a translation placeholder, the object's `__toString` method will be invoked. The [`__toString`](https://www.php.net/manual/en/language.oop5.magic.php#object.tostring) method is one of PHP's built-in "magic methods". However, sometimes you may not have control over the `__toString` method of a given class, such as when the class that you are interacting with belongs to a third-party library.
210+
If you attempt to provide an object as a translation placeholder, the object's `__toString` method will be invoked. The [__toString](https://www.php.net/manual/en/language.oop5.magic.php#object.tostring) method is one of PHP's built-in "magic methods". However, sometimes you may not have control over the `__toString` method of a given class, such as when the class that you are interacting with belongs to a third-party library.
211211

212212
In these cases, Laravel allows you to register a custom formatting handler for that particular type of object. To accomplish this, you should invoke the translator's `stringable` method. The `stringable` method accepts a closure, which should type-hint the type of object that it is responsible for formatting. Typically, the `stringable` method should be invoked within the `boot` method of your application's `AppServiceProvider` class:
213213

original-en/logging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ Laravel Pail is a package that allows you to easily dive into your Laravel appli
529529
### Installation
530530

531531
> [!WARNING]
532-
> Laravel Pail requires [PHP 8.2+](https://php.net/releases/) and the [PCNTL](https://www.php.net/manual/en/book.pcntl.php) extension.
532+
> Laravel Pail requires the [PCNTL](https://www.php.net/manual/en/book.pcntl.php) PHP extension.
533533
534534
To get started, install Pail into your project using the Composer package manager:
535535

original-en/mail.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,10 @@ However, if your application uses the same "from" address for all of its emails,
359359
In addition, you may define a global "reply_to" address within your `config/mail.php` configuration file:
360360

361361
```php
362-
'reply_to' => ['address' => 'example@example.com', 'name' => 'App Name'],
362+
'reply_to' => [
363+
'address' => 'example@example.com',
364+
'name' => 'App Name',
365+
],
363366
```
364367

365368
<a name="configuring-the-view"></a>
@@ -380,7 +383,7 @@ public function content(): Content
380383
```
381384

382385
> [!NOTE]
383-
> You may wish to create a `resources/views/emails` directory to house all of your email templates; however, you are free to place them wherever you wish within your `resources/views` directory.
386+
> You may wish to create a `resources/views/mail` directory to house all of your email templates; however, you are free to place them wherever you wish within your `resources/views` directory.
384387
385388
<a name="plain-text-emails"></a>
386389
#### Plain Text Emails
@@ -502,7 +505,7 @@ class OrderShipped extends Mailable
502505
}
503506
```
504507

505-
Once the data has been passed to the `with` method, it will automatically be available in your view, so you may access it like you would access any other data in your Blade templates:
508+
Once the data has been passed via the `with` parameter, it will automatically be available in your view, so you may access it like you would access any other data in your Blade templates:
506509

507510
```blade
508511
<div>
@@ -769,7 +772,7 @@ public function envelope(): Envelope
769772
}
770773
```
771774

772-
If your application is using the Mailgun driver, you may consult Mailgun's documentation for more information on [tags](https://documentation.mailgun.com/docs/mailgun/user-manual/tracking-messages/#tagging) and [metadata](https://documentation.mailgun.com/docs/mailgun/user-manual/tracking-messages/#attaching-data-to-messages). Likewise, the Postmark documentation may also be consulted for more information on their support for [tags](https://postmarkapp.com/blog/tags-support-for-smtp) and [metadata](https://postmarkapp.com/support/article/1125-custom-metadata-faq).
775+
If your application is using the Mailgun driver, you may consult Mailgun's documentation for more information on [tags](https://documentation.mailgun.com/docs/mailgun/user-manual/tracking-messages/#tags) and [metadata](https://documentation.mailgun.com/docs/mailgun/user-manual/sending-messages/#attaching-metadata-to-messages). Likewise, the Postmark documentation may also be consulted for more information on their support for [tags](https://postmarkapp.com/blog/tags-support-for-smtp) and [metadata](https://postmarkapp.com/support/article/1125-custom-metadata-faq).
773776

774777
If your application is using Amazon SES to send emails, you should use the `metadata` method to attach [SES "tags"](https://docs.aws.amazon.com/ses/latest/APIReference/API_MessageTag.html) to the message.
775778

@@ -1146,7 +1149,7 @@ Mail::to($request->user())->locale('es')->send(
11461149
```
11471150

11481151
<a name="user-preferred-locales"></a>
1149-
### User Preferred Locales
1152+
#### User Preferred Locales
11501153

11511154
Sometimes, applications store each user's preferred locale. By implementing the `HasLocalePreference` contract on one or more of your models, you may instruct Laravel to use this stored locale when sending mail:
11521155

@@ -1456,7 +1459,7 @@ class LogMessage
14561459
<a name="custom-transports"></a>
14571460
## Custom Transports
14581461

1459-
Laravel includes a variety of mail transports; however, you may wish to write your own transports to deliver email via other services that Laravel does not support out of the box. To get started, define a class that extends the `Symfony\Component\Mailer\Transport\AbstractTransport` class. Then, implement the `doSend` and `__toString()` methods on your transport:
1462+
Laravel includes a variety of mail transports; however, you may wish to write your own transports to deliver email via other services that Laravel does not support out of the box. To get started, define a class that extends the `Symfony\Component\Mailer\Transport\AbstractTransport` class. Then, implement the `doSend` and `__toString` methods on your transport:
14601463

14611464
```php
14621465
use MailchimpTransactional\ApiClient;
@@ -1508,14 +1511,19 @@ Once you've defined your custom transport, you may register it via the `extend`
15081511
```php
15091512
use App\Mail\MailchimpTransport;
15101513
use Illuminate\Support\Facades\Mail;
1514+
use MailchimpTransactional\ApiClient;
15111515

15121516
/**
15131517
* Bootstrap any application services.
15141518
*/
15151519
public function boot(): void
15161520
{
15171521
Mail::extend('mailchimp', function (array $config = []) {
1518-
return new MailchimpTransport(/* ... */);
1522+
$client = new ApiClient;
1523+
1524+
$client->setApiKey($config['key']);
1525+
1526+
return new MailchimpTransport($client);
15191527
});
15201528
}
15211529
```
@@ -1525,6 +1533,7 @@ Once your custom transport has been defined and registered, you may create a mai
15251533
```php
15261534
'mailchimp' => [
15271535
'transport' => 'mailchimp',
1536+
'key' => env('MAILCHIMP_API_KEY'),
15281537
// ...
15291538
],
15301539
```
@@ -1570,7 +1579,7 @@ public function boot(): void
15701579
}
15711580
```
15721581

1573-
Once your transport has been registered, you may create a mailer definition within your application's config/mail.php configuration file that utilizes the new transport:
1582+
Once your transport has been registered, you may create a mailer definition within your application's `config/mail.php` configuration file that utilizes the new transport:
15741583

15751584
```php
15761585
'brevo' => [

original-en/prompts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ $response = spin(
864864
```
865865

866866
> [!WARNING]
867-
> The `spin` function requires the `pcntl` PHP extension to animate the spinner. When this extension is not available, a static version of the spinner will appear instead.
867+
> The `spin` function requires the [PCNTL](https://www.php.net/manual/en/book.pcntl.php) PHP extension to animate the spinner. When this extension is not available, a static version of the spinner will appear instead.
868868
869869
<a name="progress"></a>
870870
## Progress Bars

original-en/queries.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -875,6 +875,24 @@ $patients = DB::table('patients')
875875
->get();
876876
```
877877

878+
**whereValueBetween / whereValueNotBetween / orWhereValueBetween / orWhereValueNotBetween**
879+
880+
The `whereValueBetween` method verifies that a given value is between the values of two columns of the same type in the same table row:
881+
882+
```php
883+
$patients = DB::table('products')
884+
->whereValueBetween(100, ['min_price', 'max_price'])
885+
->get();
886+
```
887+
888+
The `whereValueNotBetween` method verifies that a value lies outside the values of two columns in the same table row:
889+
890+
```php
891+
$patients = DB::table('products')
892+
->whereValueNotBetween(100, ['min_price', 'max_price'])
893+
->get();
894+
```
895+
878896
**whereNull / whereNotNull / orWhereNull / orWhereNotNull**
879897

880898
The `whereNull` method verifies that the value of the given column is `NULL`:

original-en/queues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@ class ProcessPodcast implements ShouldQueue
13541354
Sometimes, IO blocking processes such as sockets or outgoing HTTP connections may not respect your specified timeout. Therefore, when using these features, you should always attempt to specify a timeout using their APIs as well. For example, when using Guzzle, you should always specify a connection and request timeout value.
13551355

13561356
> [!WARNING]
1357-
> The `pcntl` PHP extension must be installed in order to specify job timeouts. In addition, a job's "timeout" value should always be less than its ["retry after"](#job-expiration) value. Otherwise, the job may be re-attempted before it has actually finished executing or timed out.
1357+
> The [PCNTL](https://www.php.net/manual/en/book.pcntl.php) PHP extension must be installed in order to specify job timeouts. In addition, a job's "timeout" value should always be less than its ["retry after"](#job-expiration) value. Otherwise, the job may be re-attempted before it has actually finished executing or timed out.
13581358
13591359
<a name="failing-on-timeout"></a>
13601360
#### Failing on Timeout

translation-ja/helpers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,9 @@ $joined = Arr::join($array, ', ');
666666

667667
// Tailwind, Alpine, Laravel, Livewire
668668

669-
$joined = Arr::join($array, ', ', ' and ');
669+
$joined = Arr::join($array, ', ', ', and ');
670670

671-
// Tailwind, Alpine, Laravel and Livewire
671+
// Tailwind, Alpine, Laravel, and Livewire
672672
```
673673

674674
<a name="method-array-keyby"></a>

0 commit comments

Comments
 (0)