ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '8.x'

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints
2021-06-15 17:49:26 +02:00
parent 92cd828c64 99d5ca2845
commit d4ff3b72e7
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -1,6 +1,12 @@
# Release Notes # 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) ## [v8.5.19 (2021-06-01)](https://github.com/laravel/laravel/compare/v8.5.18...v8.5.19)

1
resources/lang/en/validation.php
View File

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