Changeset 7459

Timestamp:

10/24/12 16:27:48 (12 years ago)

Author:

thiago

Message:

Ticket #3088 - Internacionalizações e correção de bug na aba.

Location:

trunk

Files:

• expressoMail1_2/index.php (modified) (1 diff)
• expressoMail1_2/js/common_functions.js (modified) (1 diff)
• expressoMail1_2/js/mail_archiver.js (modified) (2 diffs)
• expressoMail1_2/setup/phpgw_pt-br.lang (modified) (2 diffs)
• prototype/modules/mail/js/foldertree.js (modified) (2 diffs)

trunk/expressoMail1_2/index.php

@@ -328 +328 @@
                 special_folders[\'Spam\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'";
                 special_folders[\'Sent\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'";
+        special_folders[\'Outbox\'] = "Outbox";
                 var trashfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'";
                 var draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'";

trunk/expressoMail1_2/js/common_functions.js

@@ -119 +119 @@
                 return false;
         var key = _key.toLowerCase();
-        if(array_lang[key])
-                var _value = array_lang[key];
-        else
-                var _value = _key+"*";
+
+        if(array_lang[key])
+            var _value = array_lang[key];
+        else
+            var _value = _key+"*";
+    
+        
 
         if(arguments.length > 1)
                 for(j = 1; typeof(arguments[j]) != 'undefined'; j++)
                         _value = _value.replace("%"+j,arguments[j]);
-        return _value;
+    
+
+    return _value;
 }
 

trunk/expressoMail1_2/js/mail_archiver.js

@@ -1212 +1212 @@
 
 //deleteFolder operation
-MailArchiver.prototype.deleteFolder = function(folderName){
-    try{
-        ArchiveServices.deleteFolder(expresso_mail_archive.deleteFolderOperationOK, expresso_mail_archive.deleteFolderOperationFailure, expresso_mail_archive.session.id, folderName, true);
+MailArchiver.prototype.deleteFolder = function(folderId, folderName){
+    try{expresso_mail_archive.drawdata.folderName = folderName;
+        ArchiveServices.deleteFolder(expresso_mail_archive.deleteFolderOperationOK, expresso_mail_archive.deleteFolderOperationFailure, expresso_mail_archive.session.id, folderId, true);
     }
     catch (e){
@@ -1224 +1224 @@
 //deleteFolder callback OK
 MailArchiver.prototype.deleteFolderOperationOK = function (folderObject){
-    write_msg(get_lang("The local folder \"%1\" was successfully removed", expresso_mail_archive.drawdata.folderName));
+    write_msg(get_lang("The local folder %1 was successfully removed", expresso_mail_archive.drawdata.folderName));
     connector.purgeCache();
     //ttreeBox.name_folder = "root";

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -257 +257 @@
 In all the folders      expressoMail1_2 pt-br   Em todas as pastas
 Inbox   expressoMail1_2 pt-br   Caixa de Entrada
+Outbox  expressoMail1_2 pt-br   Caixa de Saída
 Include expressoMail1_2 pt-br   Incluir
 indent  expressoMail1_2 pt-br   Tabulação a esquerda
@@ -558 +559 @@
 The field \"%1\" of the message it contains     expressoMail1_2 pt-br   O campo \"%1\" da mensagem contém
 The folder %1 was successfully removed  expressoMail1_2 pt-br   A pasta %1 foi removida com sucesso!
+The local folder %1 was successfully removed    expressoMail1_2 pt-br   A pasta local %1 foi removida com sucesso!
 The folder was not deleted!     expressoMail1_2 es-es   A pasta não foi removida!
 The import was executed successfully.   expressoMail1_2 pt-br   A importação foi executada com sucesso.

trunk/prototype/modules/mail/js/foldertree.js

@@ -474 +474 @@
                                 if(folder_span.parent().parent().parent().find("input").val() == "localFolder"){
                                     var idFolder = folder_span.parent().parent().parent("li").attr("id").split("_")[2];
-                                    expresso_mail_archive.deleteFolder(idFolder);
+                                    expresso_mail_archive.deleteFolder(idFolder, folder_name);
                                      cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
                                 } else {
@@ -590 +590 @@
                                  if(existsIdenticalFolder){
                                     event.stopPropagation();
-                                    write_msg("Pasta existente, tente com outro nome.");
+                                    write_msg(get_lang("Mailbox already exists"));
                                     draw_new_tree_folder();
                                     return false;