ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrote validation library.

Browse Source
This commit is contained in:
Taylor Otwell
2011-07-12 20:04:14 -05:00
parent bbc45f92b7
commit c3b8524e1b
22 changed files with 508 additions and 1236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
system/lang.php
View File

@@ -54,26 +54,28 @@ class Lang {
/**
* Get the language line.
*
* @param string $language
* @param mixed $default
* @return string
*/
public function get($default = null)
public function get($language = null, $default = null)
{
$language = Config::get('application.language');
if (is_null($language))
{
$language = Config::get('application.language');
}
list($file, $line) = $this->parse($this->key);
$this->load($file, $language);
if ( ! array_key_exists($language.$file, static::$lines))
if ( ! isset(static::$lines[$language.$file][$line]))
{
$line = is_callable($default) ? call_user_func($default) : $default;
}
else
{
$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)
{
$line = str_replace(':'.$key, $value, $line);