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

Merge pull request #633 from crynobone/feature/validator-replace-attr 

Validator: During replace :attribute, need to verify Lang::has('key') instead of checking is_null()
This commit is contained in:
Taylor Otwell 2012-05-05 11:40:24 -07:00
parent 47b6492a7e 57f94a7829
commit 1f706bd2d1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
laravel/validator.php
View File

@ -946,17 +946,18 @@ protected function attribute($attribute)
// of the attribute name in the message. // of the attribute name in the message.
$line = "{$bundle}validation.attributes.{$attribute}"; $line = "{$bundle}validation.attributes.{$attribute}";
$display = Lang::line($line)->get($this->language); if (Lang::has($line, $this->language))
{
return Lang::line($line)->get($this->language);
}
// If no language line has been specified for the attribute, all of // If no language line has been specified for the attribute, all of
// the underscores are removed from the attribute name and that // the underscores are removed from the attribute name and that
// will be used as the attribtue name. // will be used as the attribtue name.
if (is_null($display)) else
{ {
return str_replace('_', ' ', $attribute); return str_replace('_', ' ', $attribute);
} }
return $display;
} }
/** /**