From 8dde6e0e2fe6a969b1d2a6dcf2e3cd96d8359f5b Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Thu, 4 Jun 2020 15:47:46 +0800 Subject: [PATCH] update i18n of validation message --- resources/lang/en/validation.yml | 45 ++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/resources/lang/en/validation.yml b/resources/lang/en/validation.yml index e0bbe45a..05cb0974 100644 --- a/resources/lang/en/validation.yml +++ b/resources/lang/en/validation.yml @@ -1,14 +1,13 @@ -# Blessing Skin -model: 'The :attribute must be steve, alex or cape.' - accepted: 'The :attribute must be accepted.' active_url: 'The :attribute is not a valid URL.' after: 'The :attribute must be a date after :date.' +after_or_equal: 'The :attribute must be a date after or equal to :date.' alpha: 'The :attribute may only contain letters.' -alpha_dash: 'The :attribute may only contain letters, numbers, and dashes.' +alpha_dash: 'The :attribute may only contain letters, numbers, dashes and underscores.' alpha_num: 'The :attribute may only contain letters and numbers.' array: 'The :attribute must be an array.' before: 'The :attribute must be a date before :date.' +before_or_equal: 'The :attribute must be a date before or equal to :date.' between: numeric: 'The :attribute must be between :min and :max.' file: 'The :attribute must be between :min and :max kilobytes.' @@ -18,33 +17,62 @@ boolean: 'The :attribute field must be true or false.' captcha: 'Incorrect captcha.' confirmed: 'The :attribute confirmation does not match.' 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.' different: 'The :attribute and :other must be different.' digits: 'The :attribute must be :digits digits.' digits_between: 'The :attribute must be between :min and :max digits.' +dimensions: 'The :attribute has invalid image dimensions.' distinct: 'The :attribute field has a duplicate value.' email: 'The :attribute must be a valid email address.' +ends_with: 'The :attribute must end with one of the following: :values.' exists: 'The selected :attribute is invalid.' -filled: 'The :attribute field is required.' +file: 'The :attribute must be a file.' +filled: 'The :attribute field must have a value.' +gt: + numeric: 'The :attribute must be greater than :value.' + file: 'The :attribute must be greater than :value kilobytes.' + string: 'The :attribute must be greater than :value characters.' + array: 'The :attribute must have more than :value items.' +gte: + numeric: 'The :attribute must be greater than or equal :value.' + file: 'The :attribute must be greater than or equal :value kilobytes.' + string: 'The :attribute must be greater than or equal :value characters.' + array: 'The :attribute must have :value items or more.' image: 'The :attribute must be an image.' in: 'The selected :attribute is invalid.' in_array: 'The :attribute field does not exist in :other.' integer: 'The :attribute must be an integer.' ip: 'The :attribute must be a valid IP address.' +ipv4: 'The :attribute must be a valid IPv4 address.' +ipv6: 'The :attribute must be a valid IPv6 address.' json: 'The :attribute must be a valid JSON string.' +lt: + numeric: 'The :attribute must be less than :value.' + file: 'The :attribute must be less than :value kilobytes.' + string: 'The :attribute must be less than :value characters.' + array: 'The :attribute must have less than :value items.' +lte: + numeric: 'The :attribute must be less than or equal :value.' + file: 'The :attribute must be less than or equal :value kilobytes.' + string: 'The :attribute must be less than or equal :value characters.' + array: 'The :attribute must not have more than :value items.' max: numeric: 'The :attribute may not be greater than :max.' file: 'The :attribute may not be greater than :max kilobytes.' string: 'The :attribute may not be greater than :max characters.' array: 'The :attribute may not have more than :max items.' mimes: 'The :attribute must be a file of type: :values.' +mimetypes: 'The :attribute must be a file of type: :values.' min: numeric: 'The :attribute must be at least :min.' file: 'The :attribute must be at least :min kilobytes.' string: 'The :attribute must be at least :min characters.' array: 'The :attribute must have at least :min items.' not_in: 'The selected :attribute is invalid.' +not_regex: 'The :attribute format is invalid.' numeric: 'The :attribute must be a number.' +password: The password is incorrect. present: 'The :attribute field must be present.' recaptcha: 'reCAPTCHA validation failed.' regex: 'The :attribute format is invalid.' @@ -52,7 +80,7 @@ required: 'The :attribute field is required.' required_if: 'The :attribute field is required when :other is :value.' required_unless: 'The :attribute field is required unless :other is in :values.' required_with: 'The :attribute field is required when :values is present.' -required_with_all: 'The :attribute field is required when :values is present.' +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 and :other must match.' @@ -61,10 +89,13 @@ size: file: 'The :attribute must be :size kilobytes.' string: 'The :attribute must be :size characters.' array: 'The :attribute must contain :size items.' +starts_with: 'The :attribute must start with one of the following: :values.' string: 'The :attribute must be a string.' timezone: 'The :attribute must be a valid zone.' unique: 'The :attribute has already been taken.' +uploaded: 'The :attribute failed to upload.' url: 'The :attribute format is invalid.' +uuid: 'The :attribute must be a valid UUID.' # -------------------------------------------------------------------------- # Custom Validation Language Lines @@ -88,6 +119,4 @@ url: 'The :attribute format is invalid.' # attributes: player_name: player name - new_player_name: player name identification: email or player name - sitename: site name