Changeset 7459


Ignore:
Timestamp:
10/24/12 16:27:48 (8 years ago)
Author:
thiago
Message:

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

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/index.php

    r7454 r7459  
    328328                special_folders[\'Spam\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"; 
    329329                special_folders[\'Sent\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"; 
     330        special_folders[\'Outbox\'] = "Outbox"; 
    330331                var trashfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"; 
    331332                var draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"; 
  • trunk/expressoMail1_2/js/common_functions.js

    r7414 r7459  
    119119                return false; 
    120120        var key = _key.toLowerCase(); 
    121         if(array_lang[key]) 
    122                 var _value = array_lang[key]; 
    123         else 
    124                 var _value = _key+"*"; 
     121 
     122        if(array_lang[key]) 
     123            var _value = array_lang[key]; 
     124        else 
     125            var _value = _key+"*"; 
     126     
     127         
    125128 
    126129        if(arguments.length > 1) 
    127130                for(j = 1; typeof(arguments[j]) != 'undefined'; j++) 
    128131                        _value = _value.replace("%"+j,arguments[j]); 
    129         return _value; 
     132     
     133 
     134    return _value; 
    130135} 
    131136 
  • trunk/expressoMail1_2/js/mail_archiver.js

    r7458 r7459  
    12121212 
    12131213//deleteFolder operation 
    1214 MailArchiver.prototype.deleteFolder = function(folderName){ 
    1215     try{ 
    1216         ArchiveServices.deleteFolder(expresso_mail_archive.deleteFolderOperationOK, expresso_mail_archive.deleteFolderOperationFailure, expresso_mail_archive.session.id, folderName, true); 
     1214MailArchiver.prototype.deleteFolder = function(folderId, folderName){ 
     1215    try{expresso_mail_archive.drawdata.folderName = folderName; 
     1216        ArchiveServices.deleteFolder(expresso_mail_archive.deleteFolderOperationOK, expresso_mail_archive.deleteFolderOperationFailure, expresso_mail_archive.session.id, folderId, true); 
    12171217    } 
    12181218    catch (e){ 
     
    12241224//deleteFolder callback OK 
    12251225MailArchiver.prototype.deleteFolderOperationOK = function (folderObject){ 
    1226     write_msg(get_lang("The local folder \"%1\" was successfully removed", expresso_mail_archive.drawdata.folderName)); 
     1226    write_msg(get_lang("The local folder %1 was successfully removed", expresso_mail_archive.drawdata.folderName)); 
    12271227    connector.purgeCache(); 
    12281228    //ttreeBox.name_folder = "root"; 
  • trunk/expressoMail1_2/setup/phpgw_pt-br.lang

    r7420 r7459  
    257257In all the folders      expressoMail1_2 pt-br   Em todas as pastas 
    258258Inbox   expressoMail1_2 pt-br   Caixa de Entrada 
     259Outbox  expressoMail1_2 pt-br   Caixa de Saída 
    259260Include expressoMail1_2 pt-br   Incluir 
    260261indent  expressoMail1_2 pt-br   Tabulação a esquerda 
     
    558559The field \"%1\" of the message it contains     expressoMail1_2 pt-br   O campo \"%1\" da mensagem contém 
    559560The folder %1 was successfully removed  expressoMail1_2 pt-br   A pasta %1 foi removida com sucesso! 
     561The local folder %1 was successfully removed    expressoMail1_2 pt-br   A pasta local %1 foi removida com sucesso! 
    560562The folder was not deleted!     expressoMail1_2 es-es   A pasta não foi removida! 
    561563The import was executed successfully.   expressoMail1_2 pt-br   A importação foi executada com sucesso. 
  • trunk/prototype/modules/mail/js/foldertree.js

    r7454 r7459  
    474474                                if(folder_span.parent().parent().parent().find("input").val() == "localFolder"){ 
    475475                                    var idFolder = folder_span.parent().parent().parent("li").attr("id").split("_")[2]; 
    476                                     expresso_mail_archive.deleteFolder(idFolder); 
     476                                    expresso_mail_archive.deleteFolder(idFolder, folder_name); 
    477477                                     cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu); 
    478478                                } else { 
     
    590590                                 if(existsIdenticalFolder){ 
    591591                                    event.stopPropagation(); 
    592                                     write_msg("Pasta existente, tente com outro nome."); 
     592                                    write_msg(get_lang("Mailbox already exists")); 
    593593                                    draw_new_tree_folder(); 
    594594                                    return false; 
Note: See TracChangeset for help on using the changeset viewer.