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

Tweak the language line logic.

This commit is contained in:
Taylor Otwell 2011-11-23 08:29:23 -06:00
parent 2a27e5d3e4
commit 3e90009263
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
laravel/lang.php
View File

@ -65,7 +65,10 @@ protected function __construct($key, $replacements = array(), $language = null)
*/ */
public static function line($key, $replacements = array(), $language = null) public static function line($key, $replacements = array(), $language = null)
{ {
if (is_null($language)) $language = Config::$items['application']['language']; if (is_null($language))
{
$language = Config::$items['application']['language'];
}
return new static($key, $replacements, $language); return new static($key, $replacements, $language);
} }
@ -93,7 +96,7 @@ public static function line($key, $replacements = array(), $language = null)
*/ */
public function get($language = null, $default = null) public function get($language = null, $default = null)
{ {
if ( ! is_null($language)) $this->language = $language; if (is_null($language)) $language = $this->language;
list($file, $line) = $this->parse($this->key); list($file, $line) = $this->parse($this->key);
@ -102,7 +105,7 @@ public function get($language = null, $default = null)
return ($default instanceof Closure) ? call_user_func($default) : $default; return ($default instanceof Closure) ? call_user_func($default) : $default;
} }
return $this->replace(Arr::get(static::$lines[$this->language][$file], $line, $default)); return $this->replace(Arr::get(static::$lines[$language][$file], $line, $default));
} }
/** /**