See Changelog

Monotone-Parent: c3a22a583cea706854120e86a951cb29014d4b87
Monotone-Revision: 33b0351ec935bf11e615865737fa2434e2208e1b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-11-10T20:12:18
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,12 @@
 2010-11-10  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/MailerUI/UIxMailEditor.m (-sendAction): the error message (if
+	any) is now translated in the HTTP response.
+
+	* SoObjects/SOGo/SOGoMailer.m
+	(:_smtpSendData:toRecipients:sender:): added exception handling
+	when the smtp server is not accessible.
+
 	* UI/WebServerResources/MailerUI.js (openMailbox): improved
 	behavior when reloading the mailbox.
 	(onMenuEmptyTrashCallback): new callback exclusive to the "empty

UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings

@@ -282,3 +282,8 @@
 "error_validationfailed" = "Validação falhou";
 "error_missingsubject" = "Está faltando o Assunto";
 "error_missingrecipients" = "Sem destinatários selecionados";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/Catalan.lproj/Localizable.strings

@@ -110,6 +110,9 @@
 "Load Images" = "Carregar imatges";
 
 "Return Receipt" = "Justificant de recepció";
+"The sender of this message has asked to be notified when you read this message. Do you with to notify the sender?" = "The sender of this message has asked to be notified when you read this message. Do you with to notify the sender?";
+"Return Receipt (displayed) - %@"= "Return Receipt (displayed) - %@";
+"This is a Return Receipt for the mail that you sent to %@.\n\nNote: This Return Receipt only acknowledges that the message was displayed on the recipient's computer. There is no guarantee that the recipient has read or understood the message contents." = "This is a Return Receipt for the mail that you sent to %@.\n\nNote: This Return Receipt only acknowledges that the message was displayed on the recipient's computer. There is no guarantee that the recipient has read or understood the message contents.";
 
 "Priority" = "Prioritat";
 "highest" = "Màxima";
@@ -191,6 +194,8 @@
 "Delete Folder" = "Esborrar carpeta";
 "Use This Folder For" = "Usar aquesta carpeta per a";
 "Get Messages for Account" = "Rebre missatges per a compte";
+"Properties..." = "Properties...";
+"Delegation..." = "Delegation...";
 
 /* Use This Folder menu */
 "Sent Messages" = "Enviar missatges";
@@ -269,7 +274,16 @@
 "Copying a message into its own folder is impossible!"
 = "No es poden copiar missatges en la mateixa carpeta.";
 
+/* Message operations */
+"The messages could not be moved to the trash folder. Would you like to delete them immediately?"
+= "The messages could not be moved to the trash folder. Would you like to delete them immediately?";
+
 /* Message editing */
 "error_validationfailed" = "Error de validació";
 "error_missingsubject" = "No heu indicat l'assumpte";
 "error_missingrecipients" = "No heu indicat els destinataris";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/Czech.lproj/Localizable.strings

@@ -184,7 +184,6 @@
 "Open in New Mail Window" = "Otevřít v novém mailovém okně";
 "Copy Folder Location" = "Kopírovat adresu složky";
 "Subscribe..." = "Odebírat...";
-"Properties..." = "Vlastnosti...";
 "Mark Folder Read..." = "Označit složku jako přečtenou...";
 "New Folder..." = "Nová složka...";
 "Compact This Folder" = "Provést údržbu složky";
@@ -275,7 +274,16 @@
 "Copying a message into its own folder is impossible!"
 = "Je nemožné zkopírovat zprávu do své vlastní složky!";
 
+/* Message operations */
+"The messages could not be moved to the trash folder. Would you like to delete them immediately?"
+= "The messages could not be moved to the trash folder. Would you like to delete them immediately?";
+
 /* Message editing */
 "error_validationfailed" = "Potvrzení selhalo";
 "error_missingsubject" = "Chybí předmět";
 "error_missingrecipients" = "Příjemci nebyli specifikováni";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/Dutch.lproj/Localizable.strings

@@ -282,3 +282,8 @@
 "error_validationfailed" = "Validering mislukt!";
 "error_missingsubject" = "U heeft geen onderwerp opgegeven!";
 "error_missingrecipients" = "U heeft geen ontvanger opgegeven!";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/English.lproj/Localizable.strings

@@ -282,3 +282,8 @@
 "error_validationfailed" = "Validation failed";
 "error_missingsubject" = "Subject is missing";
 "error_missingrecipients" = "No recipients specified";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/French.lproj/Localizable.strings

@@ -282,3 +282,8 @@
 "error_validationfailed" = "Message invalide";
 "error_missingsubject" = "- le sujet est manquant";
 "error_missingrecipients" = "- aucun destinataire spécifié";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Le message n'a pas pu être envoyé car aucune adresse n'est valide.";
+"cannot send message (smtp) - recipients discarded:" = "Le message n'a pas pu être envoyé car les adresses suivantes sont invalides :";
+"cannot send message: (smtp) error when connecting" = "Le message n'a pas pu être envoyé: une erreur est survenue en tentant de rejoindre le serveur SMTP.";

UI/MailerUI/Hungarian.lproj/Localizable.strings

@@ -282,3 +282,8 @@
 "error_validationfailed" = "Az ellenőrzés végrehatása nem sikerült";
 "error_missingsubject" = "Az üzenet tárgya hiányzik";
 "error_missingrecipients" = "Nincsenek címzettek megadva";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/Italian.lproj/Localizable.strings

@@ -13,15 +13,12 @@
 "Print"       = "Stampa";
 "Stop"        = "Stop";
 "Write"       = "Scrivi";
-"Attachment"  = "Allegato";
-"Unread"      = "Non letta";
-"Flagged"     = "Contrassegnato";
 
 "Send" = "Invia";
 "Contacts" = "Contatti";
 "Attach" = "Allegato";
 "Save" = "Salva";
-"Priority" = "Priorità";
+"Options" = "Options";
 "Size" = "Dimensione";
 
 /* Tooltips */
@@ -40,6 +37,9 @@
 "Mark the selected messages as junk" = "Contrassegna il messaggio selezionato come indesiderato";
 "Print this message" = "Stampa questo messaggio";
 "Stop the current transfer" = "Ferma il trasferimento in corso";
+"Attachment" = "Allegato";
+"Unread" = "Non letti";
+"Flagged" = "Contrassegnato";
 
 /* Main Frame  */
 
@@ -88,7 +88,7 @@
 
 "From"          = "Da";
 "Subject"       = "Oggetto";
-"To"		= "A";
+"To"            = "A";
 "Cc"            = "Cc";
 "Bcc"           = "Bcc";
 "Reply-To"	= "Rispondi a";
@@ -109,6 +109,12 @@
 "Edit Draft..." = "Modifica bozza...";
 "Load Images" = "Carica Immagini";
 
+"Return Receipt" = "Return Receipt";
+"The sender of this message has asked to be notified when you read this message. Do you with to notify the sender?" = "The sender of this message has asked to be notified when you read this message. Do you with to notify the sender?";
+"Return Receipt (displayed) - %@"= "Return Receipt (displayed) - %@";
+"This is a Return Receipt for the mail that you sent to %@.\n\nNote: This Return Receipt only acknowledges that the message was displayed on the recipient's computer. There is no guarantee that the recipient has read or understood the message contents." = "This is a Return Receipt for the mail that you sent to %@.\n\nNote: This Return Receipt only acknowledges that the message was displayed on the recipient's computer. There is no guarantee that the recipient has read or understood the message contents.";
+
+"Priority" = "Priorità";
 "highest" = "Molto alta";
 "high" = "Alta";
 "normal" = "Normale";
@@ -178,7 +184,6 @@
 "Open in New Mail Window" = "Apri in una nuova finestra";
 "Copy Folder Location" = "Copia cartella";
 "Subscribe..." = "Sottoscrivi...";
-"Properties..." = "Proprietà...";
 "Mark Folder Read..." = "Contrassegna cartella come già letta...";
 "New Folder..." = "Nuova cartella...";
 "Compact This Folder" = "Compatta cartella";
@@ -237,9 +242,9 @@
 /* Folder operations */
 "Name :" = "Nome :";
 "Enter the new name of your folder :"
-    = "Inserisci il nuovo nome della cartella :";
+ = "Inserisci il nuovo nome della cartella :";
 "Do you really want to move this folder into the trash ?"
-    = "Sei sicuro di voler spostare la cartella nel cestino ?";
+ = "Sei sicuro di voler spostare la cartella nel cestino ?";
 "Operation failed" = "Operazione non riuscita";
 
 "Quota" = "Spazio usato";
@@ -250,25 +255,35 @@
 "Please select only one message to print." = "Per favore seleziona un solo messaggio da stampare.";
 "The message you have selected doesn't exist anymore." = "Il messaggio selezionato non esiste più.";
 
+
 "The folder with name \"%{0}\" could not be created."
-    = "La cartella con nome \"%{0}\" non può essere creata.";
+= "La cartella con nome \"%{0}\" non può essere creata.";
 "This folder could not be renamed to \"%{0}\"."
-    = "Questa cartella non puo essere rinominata in \"%{0}\".";
+= "Questa cartella non puo essere rinominata in \"%{0}\".";
 "The folder could not be deleted."
-    = "Questa cartella non può essere eliminata.";
+= "Questa cartella non può essere eliminata.";
 "The trash could not be emptied."
-    = "Il cestino non puo essere svuotato.";
+= "Il cestino non puo essere svuotato.";
 "The folder functionality could not be changed."
-    = "La funzionalita della cartella non puo essere cambiata.";
+= "La funzionalita della cartella non puo essere cambiata.";
 
 "You need to choose a non-virtual folder!" = "Devi selezionare una cartella fisica, non virtuale!";
 
 "Moving a message into its own folder is impossible!"
-    = "La cartella di destinazione coincide con la cartella di origine!";
+= "La cartella di destinazione coincide con la cartella di origine!";
 "Copying a message into its own folder is impossible!"
-    = "La cartella di destinazione coincide con la cartella di origine!";
+= "La cartella di destinazione coincide con la cartella di origine!";
+
+/* Message operations */
+"The messages could not be moved to the trash folder. Would you like to delete them immediately?"
+= "The messages could not be moved to the trash folder. Would you like to delete them immediately?";
 
 /* Message editing */
 "error_validationfailed" = "Validazione fallita";
 "error_missingsubject" = "Nessun oggetto specificato";
 "error_missingrecipients" = "Nessun destinatario specificato";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/Polish.lproj/Localizable.strings

@@ -282,3 +282,8 @@
 "error_validationfailed" = "Weryfikacja zakończona niepowodzeniem";
 "error_missingsubject" = "Brak tematu";
 "error_missingrecipients" = "Brak odbiorców";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/Russian.lproj/Localizable.strings

@@ -282,3 +282,8 @@
 "error_validationfailed" = "Проверка завершилась неудачей";
 "error_missingsubject" = "Тема сообщения не указана";
 "error_missingrecipients" = "Не указан адрес получателя";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/Spanish.lproj/Localizable.strings

@@ -282,3 +282,8 @@
 "error_validationfailed" = "Error de validación";
 "error_missingsubject" = "No ha indicado el asunto";
 "error_missingrecipients" = "No ha indicado el/los destinatario(s)";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/Swedish.lproj/Localizable.strings

@@ -282,3 +282,8 @@
 "error_validationfailed" = "Validering har misslyckats";
 "error_missingsubject" = "Ämne saknas";
 "error_missingrecipients" = "Ingen mottagare är angiven";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/UIxMailEditor.m

@@ -580,6 +580,7 @@ static NSArray *infoKeys = nil;
   SOGoDraftObject *co;
   NSDictionary *jsonResponse;
   NSException *error;
+  NSMutableArray *errorMsg;
 
   co = [self clientObject];
 
@@ -594,10 +595,17 @@ static NSArray *infoKeys = nil;
     }
 
   if (error)
-    jsonResponse = [NSDictionary dictionaryWithObjectsAndKeys:
+    {
-                                   @"failure", @"status",
+      // Only the first line is translated
-                                 [error reason], @"message",
+      errorMsg = [NSMutableArray arrayWithArray: [[error reason] componentsSeparatedByString: @"\n"]];
-                                 nil];
+      [errorMsg replaceObjectAtIndex: 0
+			  withObject: [self labelForKey: [errorMsg objectAtIndex: 0]]];
+      jsonResponse = [NSDictionary dictionaryWithObjectsAndKeys:
+				     @"failure", @"status",
+			           [errorMsg componentsJoinedByString: @"\n"],
+				   @"message",
+				   nil];
+    }
   else
     jsonResponse = [NSDictionary dictionaryWithObjectsAndKeys:
                                    @"success", @"status",

UI/MailerUI/Ukrainian.lproj/Localizable.strings

@@ -194,6 +194,8 @@
 "Delete Folder" = "Вилучити";
 "Use This Folder For" = "Використати цю теку як";
 "Get Messages for Account" = "Отримати нові повідомлення";
+"Properties..." = "Properties...";
+"Delegation..." = "Delegation...";
 
 /* Use This Folder menu */
 "Sent Messages" = "Відіслані";
@@ -280,3 +282,8 @@
 "error_validationfailed" = "Перевірка зазнала невдачі";
 "error_missingsubject" = "Не зазначено теми повідомлення";
 "error_missingrecipients" = "Не зазначено адресу отримувача";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";

UI/MailerUI/Welsh.lproj/Localizable.strings

@@ -282,3 +282,8 @@
 "error_validationfailed" = "Dilysiad wedi methu";
 "error_missingsubject" = "Testun yn eisiau";
 "error_missingrecipients" = "Dim derbynnydd wedi nodi";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
+"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
+"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";