Skip to content

S
syncEnrollments
Commit 3e900092 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Tweak the language line logic.

parent 2a27e5d3
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
laravel/lang.php
View file @ 3e900092
...@@ -65,7 +65,10 @@ class Lang { ...@@ -65,7 +65,10 @@ class Lang {
*/ */
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 @@ class Lang { ...@@ -93,7 +96,7 @@ class Lang {
*/ */
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 @@ class Lang { ...@@ -102,7 +105,7 @@ class Lang {
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));
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment