Changeset 96

Timestamp:

11/08/07 16:09:50 (16 years ago)

Author:

wmerlotto

Message:

Continuação da internacionalização do Expresso. Retirado mais strings hardcoded e internacionalizada a as pastas do IMAP. Corrigido problema na caixa de filtros.

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)
• expressoMail1_2/js/TreeS.js (modified) (3 diffs)
• expressoMail1_2/js/common_functions.js (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (3 diffs)
• expressoMail1_2/js/main.js (modified) (3 diffs)
• expressoMail1_2/js/search.js (modified) (3 diffs)
• expressoMail1_2/js/wfolders.js (modified) (3 diffs)
• expressoMail1_2/templates/default/config.tpl (modified) (1 diff)
• expressoMail1_2/templates/default/index.tpl (modified) (1 diff)
• phpgwapi/js/dftree/dftree.js (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -942 +942 @@
                                 $tmp_folder_parent = explode($this->imap_delimiter, $folder_id);
                                 $result[$i]['folder_name'] = array_pop($tmp_folder_parent);
-                                $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Caixa de Entrada' : $result[$i]['folder_name'];
+                                $result[$i]['folder_name'] = $result[$i]['folder_name'] == 'INBOX' ? 'Inbox' : $result[$i]['folder_name'];
                                 
                                 $tmp_folder_parent = implode($this->imap_delimiter, $tmp_folder_parent);
                                 $result[$i]['folder_parent'] = $tmp_folder_parent == 'INBOX' ? '' : $tmp_folder_parent;
                                         
-                                if (($val->attributes == 32) && ($result[$i]['folder_name'] != 'Caixa de Entrada'))
+                                if (($val->attributes == 32) && ($result[$i]['folder_name'] != 'Inbox'))
                                         $result[$i]['folder_hasChildren'] = 1;
                                 else

trunk/expressoMail1_2/js/TreeS.js

@@ -143 +143 @@
                         if(menu_folder){
                                 if (data[i].folder_unseen > 0)
-                                        var nn = new dNode({id:data[i].folder_id, caption:data[i].folder_name + '<font style=color:red>&nbsp(</font><span id="dftree_'+data[i].folder_id+'_unseen" style=color:red>'+data[i].folder_unseen+'</span><font style=color:red>)</font>', onClick:"change_folder('"+data[i].folder_id+"','"+data[i].folder_name+"')", plusSign:data[i].folder_hasChildren}); 
+                                        var nn = new dNode({id:data[i].folder_id, caption:lang_folder(data[i].folder_name) + '<font style=color:red>&nbsp(</font><span id="dftree_'+data[i].folder_id+'_unseen" style=color:red>'+data[i].folder_unseen+'</span><font style=color:red>)</font>', onClick:"change_folder('"+data[i].folder_id+"','"+data[i].folder_name+"')", plusSign:data[i].folder_hasChildren}); 
                                 else
-                                        var nn = new dNode({id:data[i].folder_id, caption:data[i].folder_name, onClick:"change_folder('"+data[i].folder_id+"','"+data[i].folder_name+"')", plusSign:data[i].folder_hasChildren}); 
+                                        var nn = new dNode({id:data[i].folder_id, caption:lang_folder(data[i].folder_name), onClick:"change_folder('"+data[i].folder_id+"','"+data[i].folder_name+"')", plusSign:data[i].folder_hasChildren}); 
                         }else{
-                                var nn = new dNode({id:data[i].folder_id, caption:data[i].folder_name, plusSign:data[i].folder_hasChildren});
+                                var nn = new dNode({id:data[i].folder_id, caption:lang_folder(data[i].folder_name), plusSign:data[i].folder_hasChildren});
                         }
         
@@ -154 +154 @@
                         else if (data[i].folder_parent == 'user'){
                                 if (!tree_folders.getNodeById('user')){
-                                        var n_root_shared_folders = new dNode({id:'user', caption:'Pastas compartilhadas', plusSign:true}); 
+                                        var n_root_shared_folders = new dNode({id:'user', caption:get_lang("Shared Folders"), plusSign:true}); 
                                         folders_tree.add(n_root_shared_folders,'root');
                                 }
@@ -162 +162 @@
                 
 /*              if(folders_tree._folderPr.length > 0 && destination == "div_tree"){
-                        var nw_rt = new dNode({id:'proble', caption:'<font style=color:red><b> Problemas</b></font>', plusSign:true});          
+                        var nw_rt = new dNode({id:'proble', caption:'<font style=color:red><b>' + get_lang('Problems') + '</b></font>', plusSign:true});                
                         folders_tree.add(nw_rt,'root');
 

trunk/expressoMail1_2/js/common_functions.js

@@ -669 +669 @@
         return false;
 }
+
+ function lang_folder(fn) {
+        if (fn == "Inbox") return get_lang("Inbox");
+        if (special_folders[fn])
+                return get_lang(special_folders[fn]);
+        return fn;
+ }

trunk/expressoMail1_2/js/draw_api.js

@@ -13 +13 @@
                                 else if (data[i].folder_unseen > 0)
                                 {
-                                        tree_folders.getNodeById(data[i].folder_id).alter({caption: data[i].folder_name + '<font style=color:red>&nbsp(</font><span id="dftree_'+data[i].folder_id+'_unseen" style=color:red>'+data[i].folder_unseen+'</span><font style=color:red>)</font>'});
+                                        tree_folders.getNodeById(data[i].folder_id).alter({caption:lang_folder(data[i].folder_name) + '<font style=color:red>&nbsp(</font><span id="dftree_'+data[i].folder_id+'_unseen" style=color:red>'+data[i].folder_unseen+'</span><font style=color:red>)</font>'});
                                         tree_folders.getNodeById(data[i].folder_id)._refresh();
                                 }
                                 else if (data[i].folder_unseen <= 0)
                                 {
-                                        tree_folders.getNodeById(data[i].folder_id).alter({caption: data[i].folder_name});
+                                        tree_folders.getNodeById(data[i].folder_id).alter({caption:lang_folder(data[i].folder_name)});
                                         tree_folders.getNodeById(data[i].folder_id)._refresh();
                                 }
@@ -43 +43 @@
                 for (var i=0; i<folders.length; i++){
                         if (folders[i].folder_unseen > 0)
-                                var nn = new dNode({id:folders[i].folder_id, caption:folders[i].folder_name + '<font style=color:red>&nbsp(</font><span id="dftree_'+folders[i].folder_id+'_unseen" style=color:red>'+folders[i].folder_unseen+'</span><font style=color:red>)</font>', onClick:"change_folder('"+folders[i].folder_id+"','"+folders[i].folder_name+"')", plusSign:folders[i].folder_hasChildren}); 
+                                var nn = new dNode({id:folders[i].folder_id, caption:lang_folder(folders[i].folder_name) + '<font style=color:red>&nbsp(</font><span id="dftree_'+folders[i].folder_id+'_unseen" style=color:red>'+folders[i].folder_unseen+'</span><font style=color:red>)</font>', onClick:"change_folder('"+folders[i].folder_id+"','"+folders[i].folder_name+"')", plusSign:folders[i].folder_hasChildren}); 
+
                         else
-                                var nn = new dNode({id:folders[i].folder_id, caption:folders[i].folder_name, onClick:"change_folder('"+folders[i].folder_id+"','"+folders[i].folder_name+"')", plusSign:folders[i].folder_hasChildren}); 
+                                var nn = new dNode({id:folders[i].folder_id, caption:lang_folder(folders[i].folder_name), onClick:"change_folder('"+folders[i].folder_id+"','"+folders[i].folder_name+"')", plusSign:folders[i].folder_hasChildren}); 
                         
                         if (folders[i].folder_parent == '')
@@ -123 +124 @@
                         if(!verify_session(data))
                                 return;
-                        Element("border_id_0").innerHTML = "&nbsp;" + folder_name + '&nbsp;<font face="Verdana" size="1" color="#505050">[<span id="new_m">&nbsp;</span> / <span id="tot_m">0</span>]</font>';
+                        Element("border_id_0").innerHTML = "&nbsp;" + lang_folder(folder_name) + '&nbsp;<font face="Verdana" size="1" color="#505050">[<span id="new_m">&nbsp;</span> / <span id="tot_m">0</span>]</font>';
                         draw_box(data, current_folder);
                         draw_paging(data.num_msgs);

trunk/expressoMail1_2/js/main.js

@@ -130 +130 @@
 
         if ((parseInt(preferences.save_deleted_msg)) && (folder!='INBOX'+cyrus_delimiter+'Lixeira')){
-                move_msgs(folder, msgs_number, border_ID, 'INBOX'+cyrus_delimiter+'Lixeira', 'Lixeira');
+                move_msgs(folder, msgs_number, border_ID, 'INBOX'+cyrus_delimiter+trashfolder,trashfolder );
                 return;
         }
@@ -191 +191 @@
                 }
                 if (data.msgs_number.length == 1)
-                        write_msg(get_lang("The message was moved to %1 folder.", data.new_folder_name));
+                        write_msg(get_lang("The message was moved to ") + lang_folder(data.new_folder_name) + get_lang(" folder."));
                 else
-                        write_msg(get_lang("The messages were moved to %1 folder.", data.new_folder_name));
+
+                        write_msg(get_lang("The messages were moved to ") + lang_folder(data.new_folder_name) + get_lang(" folder."));          
 
                 if (data.border_ID != '' && data.border_ID != 'null'){
@@ -753 +754 @@
                         kill_current_box();
                 }
-                tree_folders.getNodeById('INBOX'+cyrus_delimiter+'Lixeira').alter({caption: 'Lixeira'});
+                tree_folders.getNodeById('INBOX'+cyrus_delimiter+trashfolder).alter({caption: get_lang("Trash")});
                 tree_folders.getNodeById('INBOX'+cyrus_delimiter+'Lixeira')._refresh();
                 update_quota();

trunk/expressoMail1_2/js/search.js

@@ -240 +240 @@
                                                 td.style.overflow = "hidden";
                                                 if(td1 == "INBOX"){
-                                                        var td1  = "Caixa de Entrada";
+                                                        var td1  = get_lang("Inbox");
                                                 }
                                         }
@@ -343 +343 @@
                         name_box_def = name_box[(name_box.length-1)];
                 }else{
-                        name_box_def = "Caixa de Entrada";              
+                        name_box_def = get_lang("Inbox");               
                 }
                 if( sel.length > 0){
@@ -353 +353 @@
                         }
                 }
-                var opt = new Option(name_box_def,this.name_box_search,false,true);
+                var opt = new Option(lang_folder(name_box_def),this.name_box_search,false,true);
                 sel[sel.length] = opt;
         }

trunk/expressoMail1_2/js/wfolders.js

@@ -81 +81 @@
                 {
                         wfolders_tree = new dFTree({name: 'wfolders_tree'});
-                        var n_root = new dNode({id:'root', caption:'Minhas Pastas'});
+                        var n_root = new dNode({id:'root', caption:get_lang("My Folders")});
                         wfolders_tree.add(n_root,'anything'); //Places the root; second argument can be anything.
 
@@ -87 +87 @@
                         for (var i=1; i<folders.length; i++)
                         {
-                                var nn = new dNode({id:folders[i].id, caption:folders[i].caption, plusSign:folders[i].plusSign});
+                                var nn = new dNode({id:folders[i].id, caption:lang_folder(folders[i].caption), plusSign:folders[i].plusSign});
                                 wfolders_tree.add(nn,folders[i].parent);
                         }
@@ -101 +101 @@
         {
                 if(! div) {
-                        alert('Essa lista não possui nenhum participante.');
+                        alert(get_lang("This list has no participants."));
                         return;
                 }

trunk/expressoMail1_2/templates/default/config.tpl

@@ -33 +33 @@
     </td>
    </tr>
+   <tr bgcolor="{row_off}">
+        <td><td colspan="2"><b>{lang_Imap_Folders_Properties}</b></td></tr>
+   <tr bgcolor="{row_on}">
+        <td>{lang_Trash_Folder_name}</td>
+        <td> <input type="text" name="newsettings[expressoMail_trash_folder]" value="{value_expressoMail_trash_folder}" size="60" /></td></tr>
+   <tr bgcolor="{row_off}">
+        <td>{lang_Drafts_Folder_name}</td>
+        <td> <input type="text" name="newsettings[expressoMail_drafts_folder]" value="{value_expressoMail_drafts_folder}" size="60" /></td></tr>
+   <tr bgcolor="{row_on}">
+        <td>{lang_Sent_Folder_name}</td>
+        <td> <input type="text" name="newsettings[expressoMail_sent_folder]" value="{value_expressoMail_sent_folder}" size="60" /></td></tr>
+   <tr bgcolor="{row_off}">
+        <td>{lang_Spam_Folder_name}</td>
+        <td> <input type="text" name="newsettings[expressoMail_spam_folder]" value="{value_expressoMail_spam_folder}" size="60" /></td></tr>
 <!-- END body -->
 <!-- BEGIN footer -->

trunk/expressoMail1_2/templates/default/index.tpl

@@ -45 +45 @@
                                                 <tbody id="border_tbody">
                                                         <tr id="border_tr">
-                                                                <td nowrap class="menu" onClick="alternate_border(0);"  id="border_id_0">&nbsp;Caixa de Entrada&nbsp;<font face="Verdana" size="1" color="#505050">[<span id="new_m">0</span> / <span id="tot_m">0</span>]</font>
+                                                                <td nowrap class="menu" onClick="alternate_border(0);"  id="border_id_0">&nbsp;{lang_inbox}&nbsp;<font face="Verdana" size="1" color="#505050">[<span id="new_m">0</span> / <span id="tot_m">0</span>]</font>
                                                                 </td>
                                                                 <td nowrap id="border_blank" class="last_menu" width="100%">&nbsp;</td>                                                         

trunk/phpgwapi/js/dftree/dftree.js

@@ -558 +558 @@
                 
                 if (tmp[tmp.length-1] == 'INBOX')
-                        nodes[a].caption = get_lang('INBOX');
+                        nodes[a].caption = get_lang('Inbox');
                 else if (tmp[tmp.length-1] == 'user')
-                        nodes[a].caption = 'Pastas compartilhadas';
+                        nodes[a].caption = get_lang("Shared Folders");
                 else
                         nodes[a].caption = tmp[tmp.length-1];
-                //nodes[a].caption = tmp[tmp.length-1] == 'INBOX' ? get_lang('INBOX') : tmp[tmp.length-1];
+                //nodes[a].caption = tmp[tmp.length-1] == 'INBOX' ? get_lang('Inbox') : tmp[tmp.length-1];
                 nodes[a].plusSign = node.plusSign;
         }