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

added support for custom validation lines.

This commit is contained in:
Taylor Otwell 2012-02-01 10:11:27 -06:00
parent a9873a479d
commit eaa2cf593c
2 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
application/language/en/validation.php
View File

@ -2,23 +2,6 @@
return array( return array(
/*
|--------------------------------------------------------------------------
| Validation Attribute Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are used to swap attribute place-holders
| with something more reader friendly such as "E-Mail Address" instead
| of "email". Your users will thank you.
|
| The Validator class will automatically search this array of lines it
| is attempting to replace the :attribute place-holder in messages.
| It's pretty slick. We think you'll like it.
|
*/
'attributes' => array(),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Validation Language Lines | Validation Language Lines
@ -74,4 +57,38 @@
"unique" => "The :attribute has already been taken.", "unique" => "The :attribute has already been taken.",
"url" => "The :attribute format is invalid.", "url" => "The :attribute format is invalid.",
/*
|--------------------------------------------------------------------------
| Custom Validation Language Lines
|--------------------------------------------------------------------------
|
| Here you may specify custom validation messages for attributes using the
| convention "attribute_rule" to name the lines. This helps keep your
| custom validation clean and tidy.
|
| So, say you want to use a custom validation message when validating that
| the "email" attribute is unique. Just add "email_unique" to this array
| with your custom message. The Validator will handle the rest!
|
*/
'custom' => array(),
/*
|--------------------------------------------------------------------------
| Validation Attributes
|--------------------------------------------------------------------------
|
| The following language lines are used to swap attribute place-holders
| with something more reader friendly such as "E-Mail Address" instead
| of "email". Your users will thank you.
|
| The Validator class will automatically search this array of lines it
| is attempting to replace the :attribute place-holder in messages.
| It's pretty slick. We think you'll like it.
|
*/
'attributes' => array(),
); );

10
laravel/validator.php
View File

@ -604,9 +604,15 @@ protected function message($attribute, $rule)
// First we'll check for developer specified, attribute specific messages. // First we'll check for developer specified, attribute specific messages.
// These messages take first priority. They allow the fine-grained tuning // These messages take first priority. They allow the fine-grained tuning
// of error messages for each rule. // of error messages for each rule.
if (array_key_exists($attribute.'_'.$rule, $this->messages)) $custom = $attribute.'_'.$rule;
if (array_key_exists($custom, $this->messages))
{ {
return $this->messages[$attribute.'_'.$rule]; return $this->messages[$custom];
}
elseif (Lang::has($custom = "validation.custom.{$custom}", $this->language))
{
return Lang::line($custom)->get($this->language);
} }
// Next we'll check for developer specified, rule specific error messages. // Next we'll check for developer specified, rule specific error messages.