From bd6289b1188049b0c6644b23346540ba85eefe77 Mon Sep 17 00:00:00 2001 From: Evgeny Kovalev Date: Sun, 5 May 2013 23:51:46 +0400 Subject: [PATCH 1/2] Fixes error messages. Validation allows max number. Fix for both Russian and English. NB The bug is fixed for English version V4 already. No language files for other languages for V4. Signed-off-by: Evgeny Kovalev --- application/language/en/validation.php | 6 +++--- application/language/ru/validation.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/application/language/en/validation.php b/application/language/en/validation.php index c07e4a0dba2..0d053c73b3b 100644 --- a/application/language/en/validation.php +++ b/application/language/en/validation.php @@ -46,9 +46,9 @@ "ip" => "The :attribute must be a valid IP address.", "match" => "The :attribute format is invalid.", "max" => array( - "numeric" => "The :attribute must be less than :max.", - "file" => "The :attribute must be less than :max kilobytes.", - "string" => "The :attribute must be less than :max characters.", + "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.", ), "mimes" => "The :attribute must be a file of type: :values.", "min" => array( diff --git a/application/language/ru/validation.php b/application/language/ru/validation.php index 8fd15f5c9d8..dc6a37f189c 100644 --- a/application/language/ru/validation.php +++ b/application/language/ru/validation.php @@ -45,9 +45,9 @@ "ip" => "Поле :attribute должно быть полным IP-адресом.", "match" => "Поле :attribute имеет неверный формат.", "max" => array( - "numeric" => "Поле :attribute должно быть меньше :max.", - "file" => "Поле :attribute должно быть меньше :max Килобайт.", - "string" => "Поле :attribute должно быть короче :max символов.", + "numeric" => "Поле :attribute должно быть не больше :max.", + "file" => "Поле :attribute должно быть не больше :max Килобайт.", + "string" => "Поле :attribute должно быть длиннее :max символов.", ), "mimes" => "Поле :attribute должно быть файлом одного из типов: :values.", "min" => array( @@ -101,4 +101,4 @@ 'attributes' => array(), -); \ No newline at end of file +); From accbcabfcf9050b9a45960589892cda3779e66d5 Mon Sep 17 00:00:00 2001 From: Evgeny Kovalev Date: Mon, 6 May 2013 00:01:57 +0400 Subject: [PATCH 2/2] Fixes 'greater' to 'not greater'. Signed-off-by: Evgeny Kovalev --- application/language/ru/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/ru/validation.php b/application/language/ru/validation.php index dc6a37f189c..4be4e1a9259 100644 --- a/application/language/ru/validation.php +++ b/application/language/ru/validation.php @@ -47,7 +47,7 @@ "max" => array( "numeric" => "Поле :attribute должно быть не больше :max.", "file" => "Поле :attribute должно быть не больше :max Килобайт.", - "string" => "Поле :attribute должно быть длиннее :max символов.", + "string" => "Поле :attribute должно быть не длиннее :max символов.", ), "mimes" => "Поле :attribute должно быть файлом одного из типов: :values.", "min" => array(