mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 13:44:06 -08:00
296de34e8a
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. * Upgraded framework to Laravel 6 ### TO DO: - Fix password restriction rules- the old library isn’t compatible with Laravel 6 :( - Figure out why in-app API calls are returning “Unauthorized” * More updates from Input:: to Request:: helper * Switch to Request:: from Input * Added passport config * Fixed goofy password minimum in seeder * Added laravel/helpers * Changed ($item) to ($item->id) in forms I have no idea why this is necessary * Changed ($item) to ($item->id) in forms * Updated API middleware to auth:api * Updated with added laravel auth.php values * FIxed *&!^$%^&$^%!!!! ajax issue * Switch to Request::get from Input::get * Switched to Request facade * Added password security minimums back in The package we were using has not been updated to Laravel v6, so I created custom validators instead * Added language strings for error messages for password rules * Fixed `($item)` issue in formActions for partials
132 lines
7.4 KiB
PHP
132 lines
7.4 KiB
PHP
<?php
|
|
|
|
return array(
|
|
|
|
/*
|
|
|--------------------------------------------------------------------------
|
|
| Validation Language Lines
|
|
|--------------------------------------------------------------------------
|
|
|
|
|
| The following language lines contain the default error messages used by
|
|
| the validator class. Some of these rules have multiple versions such
|
|
| such as the size rules. Feel free to tweak each of these messages.
|
|
|
|
|
*/
|
|
|
|
'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_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 - :max.',
|
|
'file' => 'The :attribute must be between :min - :max kilobytes.',
|
|
'string' => 'The :attribute must be between :min - :max characters.',
|
|
'array' => 'The :attribute must have between :min and :max items.',
|
|
],
|
|
'boolean' => 'The :attribute must be true or false.',
|
|
'case_diff' => 'The :attribute must contain at least one uppercase and one lowercase letter.',
|
|
'confirmed' => 'The :attribute confirmation does not match.',
|
|
'date' => 'The :attribute is not a valid 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.',
|
|
'dumbpwd' => 'That password is too common. Please choose another one.',
|
|
'email' => 'The :attribute format is invalid.',
|
|
'exists' => 'The selected :attribute is invalid.',
|
|
'file' => 'The :attribute must be a file.',
|
|
'filled' => 'The :attribute field must have a value.',
|
|
'hashed_pass' => 'Your password is incorrect.',
|
|
'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.',
|
|
'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.',
|
|
'letters' => 'The :attribute must contain letters',
|
|
'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.',
|
|
'numeric' => 'The :attribute must be a number.',
|
|
'numbers' => 'The :attribute must contain at least one number.',
|
|
'present' => 'The :attribute field must be present.',
|
|
'valid_regex' => 'That is not a valid regex. ',
|
|
'regex' => 'The :attribute format is invalid.',
|
|
'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_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.',
|
|
'size' => [
|
|
'numeric' => 'The :attribute must be :size.',
|
|
'file' => 'The :attribute must be :size kilobytes.',
|
|
'string' => 'The :attribute must be :size characters.',
|
|
'array' => 'The :attribute must contain :size items.',
|
|
],
|
|
'string' => 'The :attribute must be a string.',
|
|
'symbols' => 'The :attribute must contain at least one symbol.',
|
|
'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.',
|
|
"unique_undeleted" => "The :attribute must be unique.",
|
|
"import_field_empty" => "The value of the Import Field shouldn't be empty",
|
|
|
|
/*
|
|
|--------------------------------------------------------------------------
|
|
| Custom Validation Language Lines
|
|
|--------------------------------------------------------------------------
|
|
|
|
|
| Here you may specify custom validation messages for attributes using the
|
|
| convention "attribute.rule" to name the lines. This makes it quick to
|
|
| specify a specific custom language line for a given attribute rule.
|
|
|
|
|
*/
|
|
|
|
'custom' => [
|
|
'alpha_space' => "The :attribute field contains a character that is not allowed.",
|
|
"email_array" => "One or more email addresses is invalid.",
|
|
"hashed_pass" => "Your current password is incorrect",
|
|
"statuslabel_type" => "You must select a valid status label type",
|
|
],
|
|
|
|
/*
|
|
|--------------------------------------------------------------------------
|
|
| Custom Validation Attributes
|
|
|--------------------------------------------------------------------------
|
|
|
|
|
| The following language lines are used to swap attribute place-holders
|
|
| with something more reader friendly such as E-Mail Address instead
|
|
| of "email". This simply helps us make messages a little cleaner.
|
|
|
|
|
*/
|
|
|
|
'attributes' => [],
|
|
|
|
);
|