From 7282954e27fa8b427d8b4f6485e8ffb2463693bf Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 8 Aug 2011 10:44:03 -0500 Subject: [PATCH] refactor the lang class. --- system/lang.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/system/lang.php b/system/lang.php index d9ca04f3..5e5c6537 100644 --- a/system/lang.php +++ b/system/lang.php @@ -63,7 +63,10 @@ class Lang { */ public function get($language = null, $default = null) { - if (is_null($language)) $language = Config::get('application.language'); + if (is_null($language)) + { + $language = Config::get('application.language'); + } list($module, $file, $line) = $this->parse($this->key, $language); @@ -98,9 +101,15 @@ class Lang { { $module = (strpos($key, '::') !== false) ? substr($key, 0, strpos($key, ':')) : 'application'; - if ($module != 'application') $key = substr($key, strpos($key, ':') + 2); + if ($module != 'application') + { + $key = substr($key, strpos($key, ':') + 2); + } - if (count($segments = explode('.', $key)) > 1) return array($module, $segments[0], $segments[1]); + if (count($segments = explode('.', $key)) > 1) + { + return array($module, $segments[0], $segments[1]); + } throw new \Exception("Invalid language line [$key]. A specific line must be specified."); }