Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add better language support to Validator.

This commit is contained in:
Taylor Otwell 2011-07-22 11:37:16 -07:00
parent 341908d76c
commit 9f09af4a1b
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
system/validator.php
View File

@ -30,6 +30,13 @@ class Validator {
*/ */
public $errors; public $errors;
/**
* The language that should be used when retrieving error messages.
*
* @var string
*/
public $lang;
/** /**
* The "size" related validation rules. * The "size" related validation rules.
* *
@ -425,15 +432,15 @@ protected function get_message($attribute, $rule)
} }
else else
{ {
$message = Lang::line('validation.'.$rule)->get(); $message = Lang::line('validation.'.$rule)->get($this->language);
// For "size" rules that are validating strings or files, we need to adjust // For "size" rules that are validating strings or files, we need to adjust
// the default error message appropriately. // the default error message appropriately.
if (in_array($rule, $this->size_rules) and ! is_numeric($this->attributes[$attribute])) if (in_array($rule, $this->size_rules) and ! is_numeric($this->attributes[$attribute]))
{ {
return (array_key_exists($attribute, $_FILES)) return (array_key_exists($attribute, $_FILES))
? rtrim($message, '.').' '.Lang::line('validation.kilobytes')->get().'.' ? rtrim($message, '.').' '.Lang::line('validation.kilobytes')->get($this->language).'.'
: rtrim($message, '.').' '.Lang::line('validation.characters')->get().'.'; : rtrim($message, '.').' '.Lang::line('validation.characters')->get($this->language).'.';
} }
return $message; return $message;
@ -451,7 +458,7 @@ protected function get_message($attribute, $rule)
*/ */
protected function format_message($message, $attribute, $rule, $parameters) protected function format_message($message, $attribute, $rule, $parameters)
{ {
$display = Lang::line('attributes.'.$attribute)->get(null, function() use ($attribute) { return str_replace('_', ' ', $attribute); }); $display = Lang::line('attributes.'.$attribute)->get($this->language, function() use ($attribute) { return str_replace('_', ' ', $attribute); });
$message = str_replace(':attribute', $display, $message); $message = str_replace(':attribute', $display, $message);
@ -504,4 +511,16 @@ protected function parse($rule)
return array(is_numeric($colon) ? substr($rule, 0, $colon) : $rule, $parameters); return array(is_numeric($colon) ? substr($rule, 0, $colon) : $rule, $parameters);
} }
/**
* Set the language that should be used when retrieving error messages.
*
* @param string $langauge
* @return Validator
*/
public function lang($language)
{
$this->language = $language;
return $this;
}
} }