ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Taylor Otwell
2013-01-05 14:05:21 -06:00
parent 912f4e5e72 731cec2475
commit 423be0495b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/language/id/pagination.php
View File

@@ -14,6 +14,6 @@ return array(
*/ */
'previous' => '« Sebelumnya', 'previous' => '« Sebelumnya',
'next' => 'Selanjutnya »', 'next' => 'Berikutnya »',
); );

2
application/language/pt/validation.php
View File

@@ -18,7 +18,7 @@ return array(
| |
*/ */
"accepted" => "O :attribute deve ser aceito.", "accepted" => "O :attribute deve ser aceite.",
"active_url" => "O :attribute não é uma URL válida.", "active_url" => "O :attribute não é uma URL válida.",
"after" => "O :attribute deve ser uma data após :date.", "after" => "O :attribute deve ser uma data após :date.",
"alpha" => "O :attribute só pode conter letras.", "alpha" => "O :attribute só pode conter letras.",

7
laravel/validator.php
View File

@@ -269,8 +269,9 @@ class Validator {
protected function validate_required_with($attribute, $value, $parameters) protected function validate_required_with($attribute, $value, $parameters)
{ {
$other = $parameters[0]; $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); return $this->validate_required($attribute, $value);
} }
@@ -986,7 +987,7 @@ class Validator {
*/ */
protected function replace_same($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);
} }
/** /**
@@ -1000,7 +1001,7 @@ class Validator {
*/ */
protected function replace_different($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);
} }
/** /**