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

return key instead of null when language line isn't found.

This commit is contained in:
Taylor Otwell 2012-05-03 08:42:44 -05:00
parent 74022cfa5a
commit c2ed9e3429
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
laravel/lang.php
View File

@ -112,13 +112,18 @@ public static function has($key, $language = null)
*/ */
public function get($language = null, $default = null) public function get($language = null, $default = null)
{ {
// If no default value is specified by the developer, we'll just return the
// key of the language line. This should indicate which language line we
// were attempting to render and is better than giving nothing back.
if (is_null($default)) $default = $this->key;
if (is_null($language)) $language = $this->language; if (is_null($language)) $language = $this->language;
list($bundle, $file, $line) = $this->parse($this->key); list($bundle, $file, $line) = $this->parse($this->key);
// If the file doesn't exist, we'll just return the default value that was // If the file does not exist, we'll just return the default value that was
// given to the method. The default value is also returned even when the // given to the method. The default value is also returned even when the
// file exists and the file does not actually contain any lines. // file exists and that file does not actually contain any lines.
if ( ! static::load($bundle, $language, $file)) if ( ! static::load($bundle, $language, $file))
{ {
return value($default); return value($default);