From ea435c644af7fdf40c0cfbf74d192ff559ff67d4 Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Tue, 7 Feb 2023 09:37:37 +1100 Subject: [PATCH 1/2] Use "must" instead of "may" --- src/Illuminate/Translation/lang/en/validation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Illuminate/Translation/lang/en/validation.php b/src/Illuminate/Translation/lang/en/validation.php index ee4c50908509..4e5ef7d66894 100644 --- a/src/Illuminate/Translation/lang/en/validation.php +++ b/src/Illuminate/Translation/lang/en/validation.php @@ -45,8 +45,8 @@ 'digits_between' => 'The :attribute field must be between :min and :max digits.', 'dimensions' => 'The :attribute field has invalid image dimensions.', 'distinct' => 'The :attribute field has a duplicate value.', - 'doesnt_end_with' => 'The :attribute field may not end with one of the following: :values.', - 'doesnt_start_with' => 'The :attribute field may not start with one of the following: :values.', + 'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.', + 'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.', 'email' => 'The :attribute field must be a valid email address.', 'ends_with' => 'The :attribute field must end with one of the following: :values.', 'enum' => 'The selected :attribute is invalid.', From fb6e16a1daaf21a05b85d65576bda1d4203fe31d Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Tue, 7 Feb 2023 09:53:35 +1100 Subject: [PATCH 2/2] Standardises language to use X must Y. --- src/Illuminate/Translation/lang/en/validation.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Illuminate/Translation/lang/en/validation.php b/src/Illuminate/Translation/lang/en/validation.php index ee4c50908509..1326a26a0d79 100644 --- a/src/Illuminate/Translation/lang/en/validation.php +++ b/src/Illuminate/Translation/lang/en/validation.php @@ -15,7 +15,7 @@ 'accepted' => 'The :attribute field must be accepted.', 'accepted_if' => 'The :attribute field must be accepted when :other is :value.', - 'active_url' => 'The :attribute field is not a valid URL.', + 'active_url' => 'The :attribute field must be a valid URL.', 'after' => 'The :attribute field must be a date after :date.', 'after_or_equal' => 'The :attribute field must be a date after or equal to :date.', 'alpha' => 'The :attribute field must only contain letters.', @@ -34,9 +34,9 @@ 'boolean' => 'The :attribute field must be true or false.', 'confirmed' => 'The :attribute field confirmation does not match.', 'current_password' => 'The password is incorrect.', - 'date' => 'The :attribute field is not a valid date.', + 'date' => 'The :attribute field must be a valid date.', 'date_equals' => 'The :attribute field must be a date equal to :date.', - 'date_format' => 'The :attribute field does not match the format :format.', + 'date_format' => 'The :attribute field must match the format :format.', 'decimal' => 'The :attribute field must have :decimal decimal places.', 'declined' => 'The :attribute field must be declined.', 'declined_if' => 'The :attribute field must be declined when :other is :value.', @@ -44,7 +44,7 @@ 'digits' => 'The :attribute field must be :digits digits.', 'digits_between' => 'The :attribute field must be between :min and :max digits.', 'dimensions' => 'The :attribute field has invalid image dimensions.', - 'distinct' => 'The :attribute field has a duplicate value.', + 'distinct' => 'The :attribute field must have distinct values.', 'doesnt_end_with' => 'The :attribute field may not end with one of the following: :values.', 'doesnt_start_with' => 'The :attribute field may not start with one of the following: :values.', 'email' => 'The :attribute field must be a valid email address.', @@ -67,7 +67,7 @@ ], 'image' => 'The :attribute field must be an image.', 'in' => 'The selected :attribute is invalid.', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => 'The :attribute field must exist in :other.', 'integer' => 'The :attribute field must be an integer.', 'ip' => 'The :attribute field must be a valid IP address.', 'ipv4' => 'The :attribute field must be a valid IPv4 address.', @@ -134,7 +134,7 @@ 'required_with_all' => 'The :attribute field is required when :values are present.', 'required_without' => 'The :attribute field is required when :values is not present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.', - 'same' => 'The :attribute field and :other must match.', + 'same' => 'The :attribute field must match :other.', 'size' => [ 'array' => 'The :attribute field must contain :size items.', 'file' => 'The :attribute field must be :size kilobytes.',