Changeset 566

Timestamp:

01/05/09 17:43:10 (15 years ago)

Author:

niltonneto

Message:

resolve #382

Location:

trunk/expressoMail1_2

Files:

• inc/load_lang.php (modified) (1 diff)
• js/common_functions.js (modified) (1 diff)

trunk/expressoMail1_2/inc/load_lang.php

@@ -14 +14 @@
                 }
         }
-        $script  = "array_lang[0] = new Array();";
-        $script .= "array_lang[1] = new Array();";              
-        $i = 0;
-        foreach($_SESSION['phpgw_info']['expressomail']['lang'] as $key => $value) {            
-                $script .= "array_lang[0][".$i."] = '".str_replace("'","\'",strtolower($key))."';";             
-                $script .= "array_lang[1][".$i."] = '".str_replace("'","\'",$value)."';";
-                $i++;                                   
-        }
+        $script  = "array_lang = new Array();";
+        foreach($_SESSION['phpgw_info']['expressomail']['lang'] as $key => $value)
+                $script .= "array_lang['".str_replace("'","\'",strtolower($key))."'] = '".str_replace("'","\'",$value)."';\n";
         echo $script;
 ?>

trunk/expressoMail1_2/js/common_functions.js

@@ -78 +78 @@
 function get_lang(_key,_arg1,_arg2,_arg3,_arg4) {
 
-        if(!array_lang[0]){             
-                return _key+"*";
-        }
-        _value = "";    
-        for(i = 0; i < array_lang[0].length;i++){
-                if(array_lang[0][i] == _key.toLowerCase()) {
-                        _value = array_lang[1][i];                                      
-                        break;
-                }
-        }       
-        
-        if(!_value)
-                return _key+"*";
-                        
+        var key = _key.toLowerCase();
+                if(array_lang[key])
+                        var _value = array_lang[key];
+                else
+                        return _key+"*";
+
         if(_arg1 || _arg2 ||_arg3 || _arg4) {
                 for(j = 1; j <= 4; j++){
                         if(eval("_arg"+j)) {
-                                var regExp = new RegExp("%"+j+"");              
+                                var regExp = new RegExp("%"+j+"");
                                 _value = _value.replace(regExp,eval("_arg"+j));
                         }
                 }
         }
-        
+
         return _value;
 }