[IMP] Added default language support feature

iNextrix · Feb 19, 2018 · 3a078d0 · 3a078d0
1 parent db62e82
commit 3a078d0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 606 deletions.
diff --git a/web_interface/astpp/application/config/config.php b/web_interface/astpp/application/config/config.php
@@ -76,7 +76,7 @@
  * | than english.
  * |
  */
-$config ['language'] = 'english';
+$config ['language'] = 'en_EN';
 
 /*
  * |--------------------------------------------------------------------------

diff --git a/web_interface/astpp/application/libraries/locale.php b/web_interface/astpp/application/libraries/locale.php
@@ -36,9 +36,10 @@ function __construct($library_name = '') {
 		$this->set_lang ();
 	}
 	function set_lang($lang = FALSE) {
-		$current_locale = $this->CI->session->userdata ( 'user_language' );
+		$current_locale = $this->CI->session->userdata ( 'user_language' );		
 		if (empty ( $current_locale )) {
-			$current_locale = 'en_US';
+			//$current_locale = 'en_US';
+			$current_locale = config_item('language');
 		}
 		putenv ( "LANG=$current_locale" );
 		//setlocale ( LC_ALL, $current_locale . ".UTF-8" );

diff --git a/web_interface/astpp/application/modules/login/controllers/login.php b/web_interface/astpp/application/modules/login/controllers/login.php
@@ -49,7 +49,7 @@ function set_lang_global($post = false) {
 		}
 		if (isset ( $post ['en_EN'] )) {
 			$language = $post ['en_EN'];
-			$this->session->unset_userdata ( 'user_language', $language );
+			$this->session->set_userdata ( 'user_language', $language );
 		}
 		$this->locale->set_lang ();
 		return true;