Changeset 1572

Timestamp:

11/03/09 11:14:50 (14 years ago)

Author:

eduardoalex

Message:

Ticket #712 - corrigida a funcao getLang e o arquivo load_lang para setar o lang na sessao

Location:

trunk/expressoMail1_2/inc

Files:

• class.functions.inc.php (modified) (1 diff)
• load_lang.php (modified) (2 diffs)

trunk/expressoMail1_2/inc/class.functions.inc.php

@@ -101 +101 @@
                 function getLang($key){
                         if ($_SESSION['phpgw_info']['expressomail']['lang'][$key])
-                                return $_SESSION['phpgw_info']['expressomail']['lang'][$key];
+                                return $_SESSION['phpgw_info']['expressomail']['lang'][$key];                   
+                        else
+                                return ($key . '*');
                 }
 

trunk/expressoMail1_2/inc/load_lang.php

@@ -5 +5 @@
         }
         
+        if(!$_SESSION['phpgw_info']['expressomail']['lang']) 
+        {
                 $array_keys = array();
                 $fn = 'setup/phpgw_'.$_SESSION['phpgw_info']['expressomail']['user']['preferences']['common']['lang'].'.lang';                  
@@ -11 +13 @@
                         while ($data = fgets($fp,16000)){
                                 list($message_id,$app_name,$null,$content) = explode("\t",substr($data,0,-1));
-                                $script .= "array_lang['".str_replace("'","\'",strtolower($message_id))."'] = '".str_replace("'","\'",$content)."';\n";
+                                $_SESSION['phpgw_info']['expressomail']['lang'][$message_id] =  $content;
                         }
                         fclose($fp);
                 }
+        }
+        
+        foreach($_SESSION['phpgw_info']['expressomail']['lang'] as $key => $value)
+                $script .= "array_lang['".str_replace("'","\'",strtolower($key))."'] = '".str_replace("'","\'",$value)."';\n";
         echo "<script type='text/javascript'>$script</script>";
 ?>