Skip to content

Commit 4c36c20

Browse files
committed
2025-01-06までの原文変更点反映。
1 parent 32ae96f commit 4c36c20

File tree

14 files changed

+38
-22
lines changed

14 files changed

+38
-22
lines changed

original-en/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ Finally, you can access the application in your web browser at: http://localhost
340340
<a name="choosing-your-sail-services"></a>
341341
### Choosing Your Sail Services
342342

343-
When creating a new Laravel application via Sail, you may use the `with` query string variable to choose which services should be configured in your new application's `docker-compose.yml` file. Available services include `mysql`, `pgsql`, `mariadb`, `redis`, `memcached`, `meilisearch`, `typesense`, `minio`, `selenium`, and `mailpit`:
343+
When creating a new Laravel application via Sail, you may use the `with` query string variable to choose which services should be configured in your new application's `docker-compose.yml` file. Available services include `mysql`, `pgsql`, `mariadb`, `redis`, `valkey`, `memcached`, `meilisearch`, `typesense`, `minio`, `selenium`, and `mailpit`:
344344

345345
```shell
346346
curl -s "https://laravel.build/example-app?with=mysql,redis" | bash

original-en/passwords.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Next, we will define a route that handles the form submission request from the "
7373
$request->only('email')
7474
);
7575

76-
return $status === Password::RESET_LINK_SENT
76+
return $status === Password::ResetLinkSent
7777
? back()->with(['status' => __($status)])
7878
: back()->withErrors(['email' => __($status)]);
7979
})->middleware('guest')->name('password.email');
@@ -136,7 +136,7 @@ Of course, we need to define a route to actually handle the password reset form
136136
}
137137
);
138138

139-
return $status === Password::PASSWORD_RESET
139+
return $status === Password::PasswordReset
140140
? redirect()->route('login')->with('status', __($status))
141141
: back()->withErrors(['email' => [__($status)]]);
142142
})->middleware('guest')->name('password.update');

original-en/pint.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
strategy:
179179
fail-fast: true
180180
matrix:
181-
php: [8.3]
181+
php: [8.4]
182182

183183
steps:
184184
- name: Checkout code
@@ -199,6 +199,4 @@ jobs:
199199

200200
- name: Commit linted files
201201
uses: stefanzweifel/git-auto-commit-action@v5
202-
with:
203-
commit_message: "Fixes coding style"
204202
```

original-en/queues.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2434,9 +2434,10 @@ In addition, you may occasionally need to test an individual job's interaction w
24342434

24352435
Sometimes, you may need to test that a queued job [releases itself back onto the queue](#manually-releasing-a-job). Or, you may need to test that the job deleted itself. You may test these queue interactions by instantiating the job and invoking the `withFakeQueueInteractions` method.
24362436

2437-
Once the job's queue interactions have been faked, you may invoke the `handle` method on the job. After invoking the job, the `assertReleased`, `assertDeleted`, `assertNotDeleted`, `assertFailed`, and `assertNotFailed` methods may be used to make assertions against the job's queue interactions:
2437+
Once the job's queue interactions have been faked, you may invoke the `handle` method on the job. After invoking the job, the `assertReleased`, `assertDeleted`, `assertNotDeleted`, `assertFailed`, `assertFailedWith`, and `assertNotFailed` methods may be used to make assertions against the job's queue interactions:
24382438

24392439
```php
2440+
use App\Exceptions\CorruptedAudioException;
24402441
use App\Jobs\ProcessPodcast;
24412442

24422443
$job = (new ProcessPodcast)->withFakeQueueInteractions();
@@ -2447,6 +2448,7 @@ $job->assertReleased(delay: 30);
24472448
$job->assertDeleted();
24482449
$job->assertNotDeleted();
24492450
$job->assertFailed();
2451+
$job->assertFailedWith(CorruptedAudioException::class);
24502452
$job->assertNotFailed();
24512453
```
24522454

original-en/sail.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- [MySQL](#mysql)
1616
- [MongoDB](#mongodb)
1717
- [Redis](#redis)
18+
- [Valkey](#valkey)
1819
- [Meilisearch](#meilisearch)
1920
- [Typesense](#typesense)
2021
- [File Storage](#file-storage)
@@ -260,10 +261,17 @@ To connect to your application's MongoDB database from your local machine, you m
260261
<a name="redis"></a>
261262
### Redis
262263

263-
Your application's `docker-compose.yml` file also contains an entry for a [Redis](https://redis.io) container. This container uses a [Docker volume](https://docs.docker.com/storage/volumes/) so that the data stored in your Redis data is persisted even when stopping and restarting your containers. Once you have started your containers, you may connect to the Redis instance within your application by setting your `REDIS_HOST` environment variable within your application's `.env` file to `redis`.
264+
Your application's `docker-compose.yml` file also contains an entry for a [Redis](https://redis.io) container. This container uses a [Docker volume](https://docs.docker.com/storage/volumes/) so that the data stored in your Redis instance is persisted even when stopping and restarting your containers. Once you have started your containers, you may connect to the Redis instance within your application by setting your `REDIS_HOST` environment variable within your application's `.env` file to `redis`.
264265

265266
To connect to your application's Redis database from your local machine, you may use a graphical database management application such as [TablePlus](https://tableplus.com). By default, the Redis database is accessible at `localhost` port 6379.
266267

268+
<a name="valkey"></a>
269+
### Valkey
270+
271+
If you choose to install Valkey service when installing Sail, your application's `docker-compose.yml` file will contain an entry for [Valkey](https://valkey.io/). This container uses a [Docker volume](https://docs.docker.com/storage/volumes/) so that the data stored in your Valkey instance is persisted even when stopping and restarting your containers. You can connect to this container in you application by setting your `REDIS_HOST` environment variable within your application's `.env` file to `valkey`.
272+
273+
To connect to your application's Valkey database from your local machine, you may use a graphical database management application such as [TablePlus](https://tableplus.com). By default, the Valkey database is accessible at `localhost` port 6379.
274+
267275
<a name="meilisearch"></a>
268276
### Meilisearch
269277

original-en/sanctum.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ axios.get('/sanctum/csrf-cookie').then(response => {
306306
});
307307
```
308308

309-
During this request, Laravel will set an `XSRF-TOKEN` cookie containing the current CSRF token. This token should then be passed in an `X-XSRF-TOKEN` header on subsequent requests, which some HTTP client libraries like Axios and the Angular HttpClient will do automatically for you. If your JavaScript HTTP library does not set the value for you, you will need to manually set the `X-XSRF-TOKEN` header to match the value of the `XSRF-TOKEN` cookie that is set by this route.
309+
During this request, Laravel will set an `XSRF-TOKEN` cookie containing the current CSRF token. This token should then be URL decoded and passed in an `X-XSRF-TOKEN` header on subsequent requests, which some HTTP client libraries like Axios and the Angular HttpClient will do automatically for you. If your JavaScript HTTP library does not set the value for you, you will need to manually set the `X-XSRF-TOKEN` header to match the URL decoded value of the `XSRF-TOKEN` cookie that is set by this route.
310310

311311
<a name="logging-in"></a>
312312
#### Logging In

original-en/validation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ By adding a `stopOnFirstFailure` property to your request class, you may inform
415415
<a name="customizing-the-redirect-location"></a>
416416
#### Customizing the Redirect Location
417417

418-
As previously discussed, a redirect response will be generated to send the user back to their previous location when form request validation fails. However, you are free to customize this behavior. To do so, define a `$redirect` property on your form request:
418+
When form request validation fails, a redirect response will be generated to send the user back to their previous location. However, you are free to customize this behavior. To do so, define a `$redirect` property on your form request:
419419

420420
/**
421421
* The URI that users should be redirected to if validation fails.
@@ -1907,7 +1907,7 @@ The field under validation must be a valid [Universally Unique Lexicographically
19071907
<a name="rule-uuid"></a>
19081908
#### uuid
19091909

1910-
The field under validation must be a valid RFC 4122 (version 1, 3, 4, or 5) universally unique identifier (UUID).
1910+
The field under validation must be a valid RFC 9562 (version 1, 3, 4, 5, 6, 7, or 8) universally unique identifier (UUID).
19111911

19121912
<a name="conditionally-adding-rules"></a>
19131913
## Conditionally Adding Rules

translation-ja/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ cd example-app
340340
<a name="choosing-your-sail-services"></a>
341341
### Sailサービスの選択
342342

343-
Sailで新しいLaravelアプリケーションを作成する際に、`with`というクエリ文字列変数を使って、新しいアプリケーションの`docker-compose.yml`ファイルで設定するサービスを選択できます。利用可能なサービスは、`mysql``pgsql``mariadb``redis``memcached``meilisearch``typesence``minio``selenium``mailpit`です。
343+
Sailで新しいLaravelアプリケーションを作成する際に、`with`というクエリ文字列変数を使って、新しいアプリケーションの`docker-compose.yml`ファイルで設定するサービスを選択できます。利用可能なサービスは、`mysql``pgsql``mariadb``redis``memcached``valkey``meilisearch``typesence``minio``selenium``mailpit`です。
344344

345345
```shell
346346
curl -s "https://laravel.build/example-app?with=mysql,redis" | bash

translation-ja/passwords.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Laravelのパスワードリセット機能を使用する前に、アプリケ
7373
$request->only('email')
7474
);
7575

76-
return $status === Password::RESET_LINK_SENT
76+
return $status === Password::ResetLinkSent
7777
? back()->with(['status' => __($status)])
7878
: back()->withErrors(['email' => __($status)]);
7979
})->middleware('guest')->name('password.email');
@@ -136,7 +136,7 @@ Laravelのパスワードリセット機能を使用する前に、アプリケ
136136
}
137137
);
138138

139-
return $status === Password::PASSWORD_RESET
139+
return $status === Password::PasswordReset
140140
? redirect()->route('login')->with('status', __($status))
141141
: back()->withErrors(['email' => [__($status)]]);
142142
})->middleware('guest')->name('password.update');

translation-ja/pint.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
strategy:
179179
fail-fast: true
180180
matrix:
181-
php: [8.3]
181+
php: [8.4]
182182

183183
steps:
184184
- name: Checkout code
@@ -199,6 +199,4 @@ jobs:
199199

200200
- name: Commit linted files
201201
uses: stefanzweifel/git-auto-commit-action@v5
202-
with:
203-
commit_message: "Fixes coding style"
204202
```

0 commit comments

Comments
 (0)