From 6a8a3bca2b16c00c447572da05097933c57f606c Mon Sep 17 00:00:00 2001 From: Nimit Suwannagate Date: Fri, 23 Nov 2012 00:42:55 +0700 Subject: [PATCH 1/4] Update laravel/validator.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix: Replace :other with Validation Attributes (from validation.php in language folder) --- laravel/validator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/validator.php b/laravel/validator.php index ab446860..22298b70 100644 --- a/laravel/validator.php +++ b/laravel/validator.php @@ -972,7 +972,7 @@ protected function replace_mimes($message, $attribute, $rule, $parameters) */ protected function replace_same($message, $attribute, $rule, $parameters) { - return str_replace(':other', $parameters[0], $message); + return str_replace(':other', $this->attribute($parameters[0]), $message); } /** @@ -986,7 +986,7 @@ protected function replace_same($message, $attribute, $rule, $parameters) */ protected function replace_different($message, $attribute, $rule, $parameters) { - return str_replace(':other', $parameters[0], $message); + return str_replace(':other', $this->attribute($parameters[0]), $message); } /** From 49456bbce629c49b20f5c27432da0c4237962093 Mon Sep 17 00:00:00 2001 From: Jorge Murta Date: Fri, 14 Dec 2012 08:38:15 +0000 Subject: [PATCH 2/4] Small Changes to the Language File (PT) --- application/language/pt/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/pt/validation.php b/application/language/pt/validation.php index d69fc70c..ee57c218 100644 --- a/application/language/pt/validation.php +++ b/application/language/pt/validation.php @@ -18,7 +18,7 @@ | */ - "accepted" => "O :attribute deve ser aceito.", + "accepted" => "O :attribute deve ser aceite.", "active_url" => "O :attribute não é uma URL válida.", "after" => "O :attribute deve ser uma data após :date.", "alpha" => "O :attribute só pode conter letras.", From dcc564931821b50fe8bf9a255c6dc22ca0817d4e Mon Sep 17 00:00:00 2001 From: James Spibey Date: Mon, 17 Dec 2012 11:33:38 +0000 Subject: [PATCH 3/4] validate_required_with fix --- laravel/validator.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/laravel/validator.php b/laravel/validator.php index ab446860..94d691b5 100644 --- a/laravel/validator.php +++ b/laravel/validator.php @@ -269,8 +269,9 @@ protected function validate_required($attribute, $value) protected function validate_required_with($attribute, $value, $parameters) { $other = $parameters[0]; + $other_value = array_get($this->attributes, $other); - if ($this->validate_required($other, $this->attributes[$other])) + if ($this->validate_required($other, $other_value)) { return $this->validate_required($attribute, $value); } From 3411d974172a18cd5cc099308b16b42736a4a21c Mon Sep 17 00:00:00 2001 From: William Notowidagdo Date: Fri, 21 Dec 2012 05:30:20 +0700 Subject: [PATCH 4/4] Update application/language/id/pagination.php Replaced 'next' translation with the correct word. --- application/language/id/pagination.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/language/id/pagination.php b/application/language/id/pagination.php index 7cdad20b..7679f1fa 100644 --- a/application/language/id/pagination.php +++ b/application/language/id/pagination.php @@ -14,6 +14,6 @@ */ 'previous' => '« Sebelumnya', - 'next' => 'Selanjutnya »', + 'next' => 'Berikutnya »', -); \ No newline at end of file +);