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

Refactoring the Lang class.

This commit is contained in:
Taylor Otwell 2011-08-02 11:03:48 -05:00
parent 92b57ca2d7
commit bc0e706c02
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
system/lang.php
View File

@ -61,7 +61,7 @@ public static function line($key, $replacements = array())
* @param mixed $default * @param mixed $default
* @return string * @return string
*/ */
public function get($language = null, $default = null) public function get($language = null, $default = '')
{ {
if (is_null($language)) if (is_null($language))
{ {
@ -72,12 +72,7 @@ public function get($language = null, $default = null)
$this->load($file, $language); $this->load($file, $language);
if ( ! isset(static::$lines[$language.$file][$line])) $line = Arr::get(static::$lines[$language.$file], $line, $default);
{
return is_callable($default) ? call_user_func($default) : $default;
}
$line = static::$lines[$language.$file][$line];
foreach ($this->replacements as $key => $value) foreach ($this->replacements as $key => $value)
{ {