Merge branch '8.x'

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints 2021-06-15 17:49:26 +02:00
commit d4ff3b72e7
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
2 changed files with 8 additions and 1 deletions

View File

@ -1,6 +1,12 @@
# Release Notes
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.19...master)
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.20...master)
## [v8.5.20 (2021-06-15)](https://github.com/laravel/laravel/compare/v8.5.19...v8.5.20)
### Changed
- Add translation for current_password rule ([#5628](https://github.com/laravel/laravel/pull/5628))
## [v8.5.19 (2021-06-01)](https://github.com/laravel/laravel/compare/v8.5.18...v8.5.19)

View File

@ -31,6 +31,7 @@
],
'boolean' => 'The :attribute field must be true or false.',
'confirmed' => 'The :attribute confirmation does not match.',
'current_password' => 'The password is incorrect.',
'date' => 'The :attribute is not a valid date.',
'date_equals' => 'The :attribute must be a date equal to :date.',
'date_format' => 'The :attribute does not match the format :format.',