Merge pull request #721 from LuckyCyborg/master

Improve the Language management
nova-framework · Apr 12, 2016 · 4f88009 · 4f88009
2 parents 977f113 + 8f798a6
commit 4f88009
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/app/Config.example.php b/app/Config.example.php
@@ -10,6 +10,7 @@
 
 namespace App;
 
+use Core\Language;
 use Helpers\Session;
 
 /**
@@ -123,5 +124,11 @@ public function __construct()
          * Start sessions.
          */
         Session::init();
+
+        /**
+         * Setup the current Language.
+         */
+        Language::init();
     }
+
 }
diff --git a/app/Controllers/Language.php b/app/Controllers/Language.php
@@ -4,13 +4,17 @@
 use Core\Language as CoreLanguage;
 use Helpers\Url;
 use Helpers\Cookie;
+use Helpers\Session;
+
 
 class Language
 {
     public function change($language)
     {
         // Only set language if it's in the Languages array
         if (preg_match ('/[a-z]/', $language) && in_array($language, CoreLanguage::$codes)) {
+            Session::set('language', ucfirst($language));
+            // Store the current Language into Cookie.
             Cookie::set(PREFIX .'language', $language);
         }
 

diff --git a/system/Core/Language.php b/system/Core/Language.php
@@ -9,6 +9,7 @@
 namespace Core;
 
 use Core\Error;
+use Helpers\Session;
 use Helpers\Cookie;
 
 /**
@@ -30,18 +31,28 @@ class Language
     private $array;
 
 
-    protected static function getCurrentLanguage($code = LANGUAGE_CODE)
+    public static function init()
     {
-        if($code != LANGUAGE_CODE) {
-            // User defined Language Code?
-            return $code;
-        } else if (Cookie::exists(PREFIX .'language')) {
+        if (Session::exists('language')) {
+            // The Language was already set; nothing to do.
+            return;
+        } else if(Cookie::exists(PREFIX .'language')) {
             $cookie = Cookie::get(PREFIX .'language');
 
             if (preg_match ('/[a-z]/', $cookie) && in_array($cookie, self::$codes)) {
-                return ucfirst($cookie);
+                Session::set('language', ucfirst($cookie));
             }
         }
+    }
+
+    protected static function getCurrentLanguage($code)
+    {
+        if ($code != LANGUAGE_CODE) {
+            // User defined Language Code?
+            return $code;
+        } else if (Session::exists('language')) {
+            return Session::get('language');
+        }
 
         return $code;
     }

diff --git a/system/Helpers/Session.php b/system/Helpers/Session.php
@@ -31,6 +31,14 @@ public static function init()
         }
     }
 
+    /**
+     * Determine if a key exists into session.
+     */
+    public static function exists($key)
+    {
+        return isset($_SESSION[SESSION_PREFIX .$key]);
+    }
+
     /**
      * Add value to a session.
      *