From a7116e71f6974885a808a7f83f57ea13d4818af6 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Mon, 8 Aug 2011 09:11:52 -0500
Subject: [PATCH] Refactoring the lang class.

---
 system/lang.php | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/system/lang.php b/system/lang.php
index 0ae40ca5..f54db0b0 100644
--- a/system/lang.php
+++ b/system/lang.php
@@ -63,10 +63,7 @@ public static function line($key, $replacements = array())
 	 */
 	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);
 
@@ -99,21 +96,13 @@ public function get($language = null, $default = null)
 	 */
 	private function parse($key, $language)
 	{
-		// Check for a module qualifier. If a module name is present, we need to extract it from
-		// the language line, otherwise, we will use "application" as the module.
 		$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);
 
 		$segments = explode('.', $key);
 
-		if (count($segments) > 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.");
 	}