Merge branch 'master' into develop

application/language/id/pagination.php

@@ -14,6 +14,6 @@ return array(
 	*/
 
 	'previous' => '« Sebelumnya',
-	'next'     => 'Selanjutnya »',
+	'next'     => 'Berikutnya »',
 
-);
+);
\ No newline at end of file

application/language/pt/validation.php

@@ -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.",
 	"after"          => "O :attribute deve ser uma data após :date.",
 	"alpha"          => "O :attribute só pode conter letras.",

laravel/validator.php

@@ -269,8 +269,9 @@ class Validator {
 	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);
 		}
@@ -986,7 +987,7 @@ class Validator {
 	 */
 	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)
 	{
-		return str_replace(':other', $parameters[0], $message);
+		return str_replace(':other', $this->attribute($parameters[0]), $message);
 	}
 
 	/**