fix conflicts

This commit is contained in:
Godfrey M 2024-07-24 12:12:04 -07:00
parent f05d8281f3
commit 950fff31ed

View file

@ -13,88 +13,149 @@ return [
| |
*/ */
'accepted' => 'The :attribute must be accepted.', 'accepted' => 'The :attribute field must be accepted.',
'active_url' => 'The :attribute is not a valid URL.', 'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
'after' => 'The :attribute must be a date after :date.', 'active_url' => 'The :attribute field must be a valid URL.',
'after_or_equal' => 'The :attribute must be a date after or equal to :date.', 'after' => 'The :attribute field must be a date after :date.',
'alpha' => 'The :attribute may only contain letters.', 'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', 'alpha' => 'The :attribute field must only contain letters.',
'alpha_num' => 'The :attribute may only contain letters and numbers.', 'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
'array' => 'The :attribute must be an array.', 'alpha_num' => 'The :attribute field must only contain letters and numbers.',
'before' => 'The :attribute must be a date before :date.', 'array' => 'The :attribute field must be an array.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.', 'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
'before' => 'The :attribute field must be a date before :date.',
'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
'between' => [ 'between' => [
'numeric' => 'The :attribute must be between :min - :max.', 'array' => 'The :attribute field must have between :min and :max items.',
'file' => 'The :attribute must be between :min - :max kilobytes.', 'file' => 'The :attribute field must be between :min and :max kilobytes.',
'string' => 'The :attribute must be between :min - :max characters.', 'numeric' => 'The :attribute field must be between :min and :max.',
'array' => 'The :attribute must have between :min and :max items.', 'string' => 'The :attribute field must be between :min and :max characters.',
], ],
'boolean' => 'The :attribute must be true or false.', 'boolean' => 'The :attribute field must be true or false.',
'confirmed' => 'The :attribute confirmation does not match.', 'can' => 'The :attribute field contains an unauthorized value.',
'date' => 'The :attribute is not a valid date.', 'confirmed' => 'The :attribute field confirmation does not match.',
'date_format' => 'The :attribute does not match the format :format.', 'contains' => 'The :attribute field is missing a required value.',
'different' => 'The :attribute and :other must be different.', 'current_password' => 'The password is incorrect.',
'digits' => 'The :attribute must be :digits digits.', 'date' => 'The :attribute field must be a valid date.',
'digits_between' => 'The :attribute must be between :min and :max digits.', 'date_equals' => 'The :attribute field must be a date equal to :date.',
'dimensions' => 'The :attribute has invalid image dimensions.', '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.',
'different' => 'The :attribute field and :other must be different.',
'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 has a duplicate value.',
'email' => 'The :attribute format is invalid.', '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.',
'exists' => 'The selected :attribute is invalid.', 'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.', 'extensions' => 'The :attribute field must have one of the following extensions: :values.',
'file' => 'The :attribute field must be a file.',
'filled' => 'The :attribute field must have a value.', 'filled' => 'The :attribute field must have a value.',
'image' => 'The :attribute must be an image.', 'gt' => [
'array' => 'The :attribute field must have more than :value items.',
'file' => 'The :attribute field must be greater than :value kilobytes.',
'numeric' => 'The :attribute field must be greater than :value.',
'string' => 'The :attribute field must be greater than :value characters.',
],
'gte' => [
'array' => 'The :attribute field must have :value items or more.',
'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
'numeric' => 'The :attribute field must be greater than or equal to :value.',
'string' => 'The :attribute field must be greater than or equal to :value characters.',
],
'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
'image' => 'The :attribute field must be an image.',
'import_field_empty' => 'The value for :fieldname cannot be null.', 'import_field_empty' => 'The value for :fieldname cannot be null.',
'in' => 'The selected :attribute is invalid.', '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 must be an integer.', 'integer' => 'The :attribute field must be an integer.',
'ip' => 'The :attribute must be a valid IP address.', 'ip' => 'The :attribute field must be a valid IP address.',
'ipv4' => 'The :attribute must be a valid IPv4 address.', 'ipv4' => 'The :attribute field must be a valid IPv4 address.',
'ipv6' => 'The :attribute must be a valid IPv6 address.', 'ipv6' => 'The :attribute field must be a valid IPv6 address.',
'is_unique_department' => 'The :attribute must be unique to this Company Location', 'json' => 'The :attribute field must be a valid JSON string.',
'json' => 'The :attribute must be a valid JSON string.', 'list' => 'The :attribute field must be a list.',
'lowercase' => 'The :attribute field must be lowercase.',
'lt' => [
'array' => 'The :attribute field must have less than :value items.',
'file' => 'The :attribute field must be less than :value kilobytes.',
'numeric' => 'The :attribute field must be less than :value.',
'string' => 'The :attribute field must be less than :value characters.',
],
'lte' => [
'array' => 'The :attribute field must not have more than :value items.',
'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
'numeric' => 'The :attribute field must be less than or equal to :value.',
'string' => 'The :attribute field must be less than or equal to :value characters.',
],
'mac_address' => 'The :attribute field must be a valid MAC address.',
'max' => [ 'max' => [
'numeric' => 'The :attribute may not be greater than :max.', 'array' => 'The :attribute field must not have more than :max items.',
'file' => 'The :attribute may not be greater than :max kilobytes.', 'file' => 'The :attribute field must not be greater than :max kilobytes.',
'string' => 'The :attribute may not be greater than :max characters.', 'numeric' => 'The :attribute field must not be greater than :max.',
'array' => 'The :attribute may not have more than :max items.', 'string' => 'The :attribute field must not be greater than :max characters.',
], ],
'mimes' => 'The :attribute must be a file of type: :values.', 'max_digits' => 'The :attribute field must not have more than :max digits.',
'mimetypes' => 'The :attribute must be a file of type: :values.', 'mimes' => 'The :attribute field must be a file of type: :values.',
'mimetypes' => 'The :attribute field must be a file of type: :values.',
'min' => [ 'min' => [
'numeric' => 'The :attribute must be at least :min.', 'array' => 'The :attribute field must have at least :min items.',
'file' => 'The :attribute must be at least :min kilobytes.', 'file' => 'The :attribute field must be at least :min kilobytes.',
'string' => 'The :attribute must be at least :min characters.', 'numeric' => 'The :attribute field must be at least :min.',
'array' => 'The :attribute must have at least :min items.', 'string' => 'The :attribute field must be at least :min characters.',
], ],
'starts_with' => 'The :attribute must start with one of the following: :values.', 'min_digits' => 'The :attribute field must have at least :min digits.',
'ends_with' => 'The :attribute must end with one of the following: :values.', 'missing' => 'The :attribute field must be missing.',
'missing_if' => 'The :attribute field must be missing when :other is :value.',
'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
'missing_with' => 'The :attribute field must be missing when :values is present.',
'missing_with_all' => 'The :attribute field must be missing when :values are present.',
'multiple_of' => 'The :attribute field must be a multiple of :value.',
'not_in' => 'The selected :attribute is invalid.', 'not_in' => 'The selected :attribute is invalid.',
'numeric' => 'The :attribute must be a number.', 'not_regex' => 'The :attribute field format is invalid.',
'present' => 'The :attribute field must be present.', 'numeric' => 'The :attribute field must be a number.',
'password' => [
'letters' => 'The :attribute field must contain at least one letter.',
'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
'numbers' => 'The :attribute field must contain at least one number.',
'symbols' => 'The :attribute field must contain at least one symbol.',
'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
],
'percent' => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.', 'percent' => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
'valid_regex' => 'That is not a valid regex. ', 'present' => 'The :attribute field must be present.',
'regex' => 'The :attribute format is invalid.', 'present_if' => 'The :attribute field must be present when :other is :value.',
'present_unless' => 'The :attribute field must be present unless :other is :value.',
'present_with' => 'The :attribute field must be present when :values is present.',
'present_with_all' => 'The :attribute field must be present when :values are present.',
'prohibited' => 'The :attribute field is prohibited.',
'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
'prohibits' => 'The :attribute field prohibits :other from being present.',
'regex' => 'The :attribute field format is invalid.',
'required' => 'The :attribute field is required.', 'required' => 'The :attribute field is required.',
'required_array_keys' => 'The :attribute field must contain entries for: :values.',
'required_if' => 'The :attribute field is required when :other is :value.', 'required_if' => 'The :attribute field is required when :other is :value.',
'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
'required_if_declined' => 'The :attribute field is required when :other is declined.',
'required_unless' => 'The :attribute field is required unless :other is in :values.', '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' => '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' => 'The :attribute field is required when :values is not present.',
'required_without_all' => 'The :attribute field is required when none of :values are present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.',
'same' => 'The :attribute and :other must match.', 'same' => 'The :attribute field must match :other.',
'size' => [ 'size' => [
'numeric' => 'The :attribute must be :size.', 'array' => 'The :attribute field must contain :size items.',
'file' => 'The :attribute must be :size kilobytes.', 'file' => 'The :attribute field must be :size kilobytes.',
'string' => 'The :attribute must be :size characters.', 'numeric' => 'The :attribute field must be :size.',
'array' => 'The :attribute must contain :size items.', 'string' => 'The :attribute field must be :size characters.',
], ],
'starts_with' => 'The :attribute field must start with one of the following: :values.',
'string' => 'The :attribute must be a string.', 'string' => 'The :attribute must be a string.',
'timezone' => 'The :attribute must be a valid zone.',
'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ', 'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
'unique' => 'The :attribute has already been taken.',
'uploaded' => 'The :attribute failed to upload.',
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.', 'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.', 'non_circular' => 'The :attribute must not create a circular reference.',
'not_array' => ':attribute cannot be an array.', 'not_array' => ':attribute cannot be an array.',
@ -103,12 +164,13 @@ return [
'numbers' => 'Password must contain at least one number.', 'numbers' => 'Password must contain at least one number.',
'case_diff' => 'Password must use mixed case.', 'case_diff' => 'Password must use mixed case.',
'symbols' => 'Password must contain symbols.', 'symbols' => 'Password must contain symbols.',
'gte' => [ 'timezone' => 'The :attribute field must be a valid timezone.',
'numeric' => 'Value cannot be negative' 'unique' => 'The :attribute has already been taken.',
], 'uploaded' => 'The :attribute failed to upload.',
'checkboxes' => ':attribute contains invalid options.', 'uppercase' => 'The :attribute field must be uppercase.',
'radio_buttons' => ':attribute is invalid.', 'url' => 'The :attribute field must be a valid URL.',
'ulid' => 'The :attribute field must be a valid ULID.',
'uuid' => 'The :attribute field must be a valid UUID.',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -138,9 +200,10 @@ return [
'expected_checkin.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format', 'expected_checkin.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format',
'start_date.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format', 'start_date.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format',
'end_date.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format', 'end_date.date_format' => 'The :attribute must be a valid date in YYYY-MM-DD format',
'checkboxes' => ':attribute contains invalid options.',
'radio_buttons' => ':attribute is invalid.',
'invalid_value_in_field' => 'Invalid value included in this field',
], ],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Custom Validation Attributes | Custom Validation Attributes
@ -156,8 +219,16 @@ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Generic Validation Messages | Generic Validation Messages - we use these in the jquery validation where we don't have
| access to the :attribute
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
'generic' => [
'invalid_value_in_field' => 'Invalid value included in this field', 'invalid_value_in_field' => 'Invalid value included in this field',
'required' => 'This field is required',
'email' => 'Please enter a valid email address',
],
]; ];