let the autoloader handle the language files;

that removes usage of exception, so removing unused "use" statement, too
Clansuite · Aug 14, 2012 · 56610a3 · 56610a3
1 parent 480ea42
commit 56610a3
Showing 1 changed file with 5 additions and 19 deletions.
diff --git a/Installation/Application/Application.php b/Installation/Application/Application.php
@@ -27,7 +27,6 @@
 namespace Clansuite\Installation\Application;
 
 use \Clansuite\Installation\Application\Helper as Helper;
-use \Clansuite\Installation\Application\Exception as Exception;
 
 /**
  * Clansuite Installation Application
@@ -165,25 +164,12 @@ public function handleRequest_Language()
 
     public function loadLanguage()
     {
-        /**
-         * Load Language File
-         */
-        try {
-            $file = INSTALLATION_ROOT . 'Languages/' . $this->locale . '.install.php';
-
-            if (is_file($file) === true) {
-                include_once $file;
-
-                $classname = '\Clansuite\Installation\Language\\' . $this->locale;
-                $this->language = new $classname;
+        // Load Language File
+        $classname = '\Clansuite\Installation\Languages\\' . $this->locale;
+        $this->language = new $classname;
 
-                $_SESSION['lang'] = $this->locale;
-            } else {
-                throw new Exception('<span style="color:red">Language file missing: <strong>' . $file . '</strong></span>');
-            }
-        } catch (\Exception $e) {
-            exit($e);
-        }
+        // set language to session
+        $_SESSION['lang'] = $this->locale;
     }
 
     /**