From dd723f9889b8e1c02f061c518c0255444c0a11cf Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 21 Apr 2025 14:06:13 +0200 Subject: [PATCH] Resolviendo conflictos --- ci4/app/Language/en/Validation.php | 96 +++++++++++++----------------- 1 file changed, 42 insertions(+), 54 deletions(-) diff --git a/ci4/app/Language/en/Validation.php b/ci4/app/Language/en/Validation.php index 0a833889..d5cc6428 100755 --- a/ci4/app/Language/en/Validation.php +++ b/ci4/app/Language/en/Validation.php @@ -1,59 +1,47 @@ 'The {field} field is required.', - 'matches' => 'The {field} field does not match the {param} field.', - 'differs' => 'The {field} field must differ from the {param} field.', - 'isUnique' => 'The value of {field} is already in use.', - 'is_natural' => 'The {field} field must only contain positive numbers.', - 'is_natural_no_zero' => 'The {field} field must be greater than zero.', - 'valid_url' => 'The {field} field must contain a valid URL.', - 'valid_email' => 'The {field} field must contain a valid email address.', - 'valid_emails' => 'The {field} field must contain only valid email addresses.', - 'valid_ip' => 'The {field} field must contain a valid IP address.', - 'valid_base64' => 'The {field} field must contain a valid Base64 string.', - 'valid_json' => 'The {field} field must contain a valid JSON string.', - 'valid_datetime' => 'The {field} field must contain a valid date and time.', - 'valid_date' => 'The {field} field must contain a valid date.', - 'valid_time' => 'The {field} field must contain a valid time.', - - // Comparison rules - 'min_length' => 'The {field} field must be at least {param} characters long.', - 'max_length' => 'The {field} field must not exceed {param} characters.', - 'exact_length' => 'The {field} field must be exactly {param} characters long.', - 'greater_than' => 'The {field} field must be greater than {param}.', + 'alpha' => 'The {field} field may only contain alphabetical characters.', + 'alpha_dash' => 'The {field} field may only contain alphanumeric characters, underscores, and dashes.', + 'alpha_numeric' => 'The {field} field may only contain alphanumeric characters.', + 'alpha_numeric_punct' => 'The {field} field may only contain alphanumeric characters, spaces, and punctuation: ~!#$%&*-_+=|:.', + 'alpha_numeric_space' => 'The {field} field may only contain alphanumeric characters and spaces.', + 'alpha_space' => 'The {field} field may only contain alphabetical characters and spaces.', + 'decimal' => 'The {field} field must contain a decimal number.', + 'differs' => 'The {field} field must differ from the {param} field.', + 'exact_length' => 'The {field} field must be exactly {param} characters in length.', + 'field_exists' => 'The {field} field must exist.', + 'greater_than' => 'The {field} field must be greater than {param}.', 'greater_than_equal_to' => 'The {field} field must be greater than or equal to {param}.', - 'less_than' => 'The {field} field must be less than {param}.', - 'less_than_equal_to' => 'The {field} field must be less than or equal to {param}.', - - // Type rules - 'alpha' => 'The {field} field may only contain alphabetic characters.', - 'alpha_space' => 'The {field} field may only contain letters and spaces.', - 'alpha_numeric' => 'The {field} field may only contain letters and numbers.', - 'alpha_numeric_space' => 'The {field} field may only contain letters, numbers, and spaces.', - 'alpha_numeric_punct' => 'The {field} field may only contain letters, numbers, spaces, and the following characters: . , : ; - _ ! ?', - 'alpha_numeric_dash' => 'The {field} field may only contain letters, numbers, underscores, and dashes.', - 'numeric' => 'The {field} field must contain only numbers.', - 'integer' => 'The {field} field must contain an integer.', - 'decimal' => 'The {field} field must contain a decimal number.', - 'natural' => 'The {field} field must contain only positive numbers.', - 'natural_no_zero' => 'The {field} field must contain a number greater than zero.', - 'in_list' => 'The {field} field must be one of the following: {param}.', - - // File validation - 'uploaded' => 'You must upload a file in the {field} field.', - 'max_size' => 'The file in the {field} field must not exceed {param} kilobytes.', - 'is_image' => 'The file in the {field} field must be a valid image.', - 'mime_in' => 'The file in the {field} field must be of type: {param}.', - 'ext_in' => 'The file in the {field} field must have one of the following extensions: {param}.', - 'max_dims' => 'The image in the {field} field must not exceed the allowed dimensions: {param}.', - - // Other - 'permit_empty' => 'The {field} field may be left empty.', - 'string' => 'The {field} field must be a text string.', - 'is_unique' => 'The {field} value already exists in the system.', - 'valid_cc_number' => 'The {field} field does not contain a valid credit card number.', - 'regex_match' => 'The {field} field format is invalid.', + 'hex' => 'The {field} field may only contain hexadecimal characters.', + 'if_exist' => 'The {field} field will be validated only if it exists.', + 'in_list' => 'The {field} field must be one of: {param}.', + 'integer' => 'The {field} field must contain an integer.', + 'is_natural' => 'The {field} field must only contain natural numbers.', + 'is_natural_no_zero' => 'The {field} field must only contain natural numbers greater than zero.', + 'is_not_unique' => 'The {field} field value already exists in the database.', + 'is_unique' => 'The {field} field value must be unique.', + 'less_than' => 'The {field} field must be less than {param}.', + 'less_than_equal_to' => 'The {field} field must be less than or equal to {param}.', + 'matches' => 'The {field} field does not match the {param} field.', + 'max_length' => 'The {field} field cannot exceed {param} characters in length.', + 'min_length' => 'The {field} field must be at least {param} characters in length.', + 'not_in_list' => 'The {field} field must not be one of: {param}.', + 'numeric' => 'The {field} field must contain only numeric characters.', + 'permit_empty' => 'The {field} field may be empty.', + 'regex_match' => 'The {field} field format is invalid.', + 'required' => 'The {field} field is required.', + 'required_with' => 'The {field} field is required when {param} is present.', + 'required_without' => 'The {field} field is required when {param} is absent.', + 'string' => 'The {field} field must be a string.', + 'timezone' => 'The {field} field must be a valid timezone.', + 'valid_base64' => 'The {field} field must contain a valid Base64 string.', + 'valid_cc_number' => 'The {field} must be a valid credit card number for the specified provider.', + 'valid_date' => 'The {field} field must contain a valid date in the format {param}.', + 'valid_email' => 'The {field} field must contain a valid email address.', + 'valid_emails' => 'All values in the {field} field must be valid email addresses.', + 'valid_ip' => 'The {field} field must contain a valid {param} IP address.', + 'valid_json' => 'The {field} field must contain a valid JSON string.', + 'valid_url' => 'The {field} field must contain a valid URL.', + 'valid_url_strict' => 'The {field} field must contain a valid URL using one of these schemas: {param}.', ];