Merged changes from main branch up to release 2.2.1

[fa-stable.git] / includes / lang / language.php

diff --git a/includes/lang/language.php b/includes/lang/language.php
index a444838c22d40fb8df9eca1f66fffe1a3e445c93..8960928377024f8071c6cf0e0b1dfaaab1eb4e29 100644 (file)
--- a/includes/lang/language.php
+++ b/includes/lang/language.php
@@ -24,12 +24,12 @@ class language
                                                // Right-To-Left (rtl)
        var $is_locale_file;
        
-       function language($name, $code, $encoding) 
+       function language($name, $code, $encoding, $dir = 'ltr') 
        {
                $this->name = $name;
                $this->code = $code;
                $this->encoding = $encoding;
-               $this->dir = "ltr";
+               $this->dir = $dir;
        }
 
        function get_language_dir() 
@@ -45,65 +45,46 @@ class language
 
        function set_language($code) 
        {
-           global $comp_path, $path_to_root;
-               
-               $changed = $_SESSION['language']->code != $code;
-               if (isset($_SESSION['languages'][$code]) && $changed)
+           global $comp_path, $path_to_root, $installed_languages;
+
+               $changed = $this->code != $code;
+               $lang = array_search_value($code, $installed_languages, 'code');
+
+               if ($lang && $changed)
                {
                // flush cache as we can use several languages in one account
-                   flush_dir($comp_path.'/'.user_company().'/js_cache');
-                   $_SESSION['language'] = $_SESSION['languages'][$code];
-                       $locale = $path_to_root . "/lang/" . $_SESSION['language']->code . "/locale.inc";
-                       // check id file exists only once for session
-                       $_SESSION['language']->is_locale_file = file_exists($locale);
+                       flush_dir($comp_path.'/'.user_company().'/js_cache');
+
+                       $this->name = $lang['name'];
+                       $this->code = $lang['code'];
+                       $this->encoding = $lang['encoding'];
+                       $this->dir = isset($lang['rtl']) ? 'rtl' : 'ltr';
+                       $locale = $path_to_root . "/lang/" . $this->code . "/locale.inc";
+                       $this->is_locale_file = file_exists($locale);
                }
 
-               $lang = $_SESSION['language'];
-               get_text::set_language($lang->code, $lang->encoding);
-               get_text::add_domain($lang->code, $path_to_root . "/lang");
-               
+               $_SESSION['get_text']->set_language($this->code, $this->encoding);
+               $_SESSION['get_text']->add_domain($this->code, $path_to_root . "/lang");
+
                // Necessary for ajax calls. Due to bug in php 4.3.10 for this 
                // version set globally in php.ini
-               ini_set('default_charset', $lang->encoding);
+               ini_set('default_charset', $this->encoding);
 
                if (isset($_SESSION['App']) && $changed)
                        $_SESSION['App']->init(); // refresh menu
        }
-
-       /**
-        * This method loads an array of language objects into a session variable
-     * called $_SESSIONS['languages']. Only supported languages are added.
-     */
-       function load_languages() 
-       {
-               global $installed_languages, $dflt_lang;
-
-               $_SESSION['languages'] = array();
-
-        foreach ($installed_languages as $lang) 
-        {
-                       $l = new language($lang['name'],$lang['code'],$lang['encoding']);
-                       if (isset($lang['rtl']))
-                               $l->dir = "rtl";
-                       $_SESSION['languages'][$l->code] = $l;
-        }
-
-               if (!isset($_SESSION['language']))
-                       $_SESSION['language'] = $_SESSION['languages'][$dflt_lang];
-       }
-
 }
 
 function _set($key,$value) 
 {
-       get_text::set_var($key,$value);
+       $_SESSION['get_text']->set_var($key,$value);
 }
 
 if (!function_exists("_")) 
 {
        function _($text) 
        {
-               $retVal = get_text::gettext($text);
+               $retVal = $_SESSION['get_text']->gettext($text);
                if ($retVal == "")
                        return $text;
                return $retVal;