diff --git a/laravel/lang.php b/laravel/lang.php index e94eccd0..b1e9c3f1 100644 --- a/laravel/lang.php +++ b/laravel/lang.php @@ -1,4 +1,4 @@ -language = $language; list($file, $line) = $this->parse($this->key); if ( ! $this->load($file)) { - return ($default instanceof \Closure) ? call_user_func($default) : $default; + return ($default instanceof Closure) ? call_user_func($default) : $default; } $line = Arr::get(static::$lines[$this->language.$file], $line, $default); @@ -123,7 +124,7 @@ public function get($language = null, $default = null) } /** - * Parse a language key. + * Parse a language key into its file and line segments. * * @param string $key * @return array @@ -139,7 +140,7 @@ protected function parse($key) } /** - * Load a language file. + * Load all of the language lines from a language file. * * @param string $file * @return bool @@ -150,6 +151,9 @@ protected function load($file) $language = array(); + // Language files cascade. Typically, the system language array is loaded first, + // followed by the application array. This allows the convenient overriding of the + // system language files (like validation) by the application developer. foreach ($this->paths as $directory) { if (file_exists($path = $directory.$this->language.'/'.$file.EXT)) @@ -158,6 +162,9 @@ protected function load($file) } } + // If language lines were actually found, they will be loaded into the array + // containing all of the lines for all languages and files. The array is + // keyed by the language and the file name. if (count($language) > 0) static::$lines[$this->language.$file] = $language; return isset(static::$lines[$this->language.$file]); @@ -166,9 +173,6 @@ protected function load($file) /** * Get the string content of the language line. */ - public function __toString() - { - return $this->get(); - } + public function __toString() { return $this->get(); } } \ No newline at end of file