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

added facades and made other ioc improvements.

Browse Source
This commit is contained in:
Taylor Otwell
2011-08-30 22:09:47 -05:00
parent 501953f2db
commit 0ef96fb8d0
27 changed files with 271 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
laravel/lang.php
View File

@@ -1,6 +1,8 @@
<?php namespace Laravel;
class Lang {
class Lang extends Facade { public static $resolve = 'lang'; }
class Lang_Engine {
/**
* All of the loaded language lines.
@@ -9,7 +11,7 @@ class Lang {
*
* @var array
*/
private static $lines = array();
private $lines = array();
/**
* The default language being used by the application.
@@ -98,7 +100,7 @@ class Lang {
return ($default instanceof \Closure) ? call_user_func($default) : $default;
}
$line = Arr::get(static::$lines[$this->line_language.$file], $line, $default);
$line = Arr::get($this->lines[$this->line_language.$file], $line, $default);
foreach ($this->replacements as $key => $value)
{
@@ -138,7 +140,7 @@ class Lang {
*/
private function load($file)
{
if (isset(static::$lines[$this->line_language.$file])) return;
if (isset($this->lines[$this->line_language.$file])) return;
$language = array();
@@ -152,10 +154,10 @@ class Lang {
if (count($language) > 0)
{
static::$lines[$this->line_language.$file] = $language;
$this->lines[$this->line_language.$file] = $language;
}
return isset(static::$lines[$this->line_language.$file]);
return isset($this->lines[$this->line_language.$file]);
}
/**