From 3d281c2f39902272aa0952cafdb1417a4a27a078 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 12 Aug 2016 11:12:13 -0400 Subject: [PATCH 1/2] (i18n) Update translations --- UI/MailerUI/Finnish.lproj/Localizable.strings | 2 +- UI/MailerUI/French.lproj/Localizable.strings | 2 +- UI/MailerUI/German.lproj/Localizable.strings | 2 +- UI/MailerUI/Italian.lproj/Localizable.strings | 2 +- UI/MailerUI/Polish.lproj/Localizable.strings | 2 +- .../TurkishTurkey.lproj/Localizable.strings | 2 +- .../Finnish.lproj/Localizable.strings | 26 +++++++++---------- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/UI/MailerUI/Finnish.lproj/Localizable.strings b/UI/MailerUI/Finnish.lproj/Localizable.strings index a5c5f3070..07636407d 100644 --- a/UI/MailerUI/Finnish.lproj/Localizable.strings +++ b/UI/MailerUI/Finnish.lproj/Localizable.strings @@ -276,7 +276,7 @@ "%{0} message(s) copied" = "%{0} viesti(ä) kopioitu"; /* Notification on the number of messages successfuly movied */ -"%{0} message(s) copied" = "%{0} viesti(ä) kopioitu"; +"%{0} message(s) moved" = "%{0} viesti(ä) siirretty"; "Please select a message." = "Ole hyvä ja valitse viesti."; "Please select a message to print." = "Ole hyvä ja valitse tulostettava viesti."; diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings index 915093437..6fc124b77 100644 --- a/UI/MailerUI/French.lproj/Localizable.strings +++ b/UI/MailerUI/French.lproj/Localizable.strings @@ -276,7 +276,7 @@ "%{0} message(s) copied" = "%{0} message(s) copié(s)"; /* Notification on the number of messages successfuly movied */ -"%{0} message(s) copied" = "%{0} message(s) copié(s)"; +"%{0} message(s) moved" = "%{0} message(s) déplacé(s)"; "Please select a message." = "Veuillez sélectionner un message."; "Please select a message to print." = "Veuillez sélectionner un message à imprimer."; diff --git a/UI/MailerUI/German.lproj/Localizable.strings b/UI/MailerUI/German.lproj/Localizable.strings index 028eab7e8..eb452e298 100644 --- a/UI/MailerUI/German.lproj/Localizable.strings +++ b/UI/MailerUI/German.lproj/Localizable.strings @@ -276,7 +276,7 @@ "%{0} message(s) copied" = "%{0} Nachrichten kopiert"; /* Notification on the number of messages successfuly movied */ -"%{0} message(s) copied" = "%{0} Nachrichten kopiert"; +"%{0} message(s) moved" = "%{0} Nachrichten verschoben"; "Please select a message." = "Sie müssen eine Nachricht auswählen."; "Please select a message to print." = "Sie müssen eine Nachricht zum Drucken auswählen."; diff --git a/UI/MailerUI/Italian.lproj/Localizable.strings b/UI/MailerUI/Italian.lproj/Localizable.strings index 57d5b05df..a1b1602a5 100644 --- a/UI/MailerUI/Italian.lproj/Localizable.strings +++ b/UI/MailerUI/Italian.lproj/Localizable.strings @@ -276,7 +276,7 @@ "%{0} message(s) copied" = "%{0} messaggi copiati"; /* Notification on the number of messages successfuly movied */ -"%{0} message(s) copied" = "%{0} messaggi copiati"; +"%{0} message(s) moved" = "%{0} messaggi spostati"; "Please select a message." = "Per favore seleziona un messaggio."; "Please select a message to print." = "Per favore seleziona un messaggio da stampare."; diff --git a/UI/MailerUI/Polish.lproj/Localizable.strings b/UI/MailerUI/Polish.lproj/Localizable.strings index aec35f4f1..fb4620c2e 100644 --- a/UI/MailerUI/Polish.lproj/Localizable.strings +++ b/UI/MailerUI/Polish.lproj/Localizable.strings @@ -276,7 +276,7 @@ "%{0} message(s) copied" = "Skopiowano %{0} wiadomości"; /* Notification on the number of messages successfuly movied */ -"%{0} message(s) copied" = "Skopiowano %{0} wiadomości"; +"%{0} message(s) moved" = "Przeniesiono %{0} wiadomości"; "Please select a message." = "Zaznacz wiadomość."; "Please select a message to print." = "Zaznacz wiadomość do drukowania."; diff --git a/UI/MailerUI/TurkishTurkey.lproj/Localizable.strings b/UI/MailerUI/TurkishTurkey.lproj/Localizable.strings index 694ef4aa8..21e8eb813 100644 --- a/UI/MailerUI/TurkishTurkey.lproj/Localizable.strings +++ b/UI/MailerUI/TurkishTurkey.lproj/Localizable.strings @@ -276,7 +276,7 @@ "%{0} message(s) copied" = "%{0} ileti kopyalandı"; /* Notification on the number of messages successfuly movied */ -"%{0} message(s) copied" = "%{0} ileti kopyalandı"; +"%{0} message(s) moved" = "%{0} ileti taşındı"; "Please select a message." = "Lütfen bir ileti seçin."; "Please select a message to print." = "Lütfen yazdırılacak iletiyi seçin."; diff --git a/UI/PreferencesUI/Finnish.lproj/Localizable.strings b/UI/PreferencesUI/Finnish.lproj/Localizable.strings index 99d21ff62..8c7f49c21 100644 --- a/UI/PreferencesUI/Finnish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Finnish.lproj/Localizable.strings @@ -63,8 +63,8 @@ /* d & t */ "Current Time Zone" = "Nykyinen aikavyöhyke"; -"Short Date Format" = "Lyhyt ajan esitysmuoto"; -"Long Date Format" = "Pitkä ajan esitysmuoto"; +"Short Date Format" = "Lyhyt päivämäärän esitysmuoto"; +"Long Date Format" = "Pitkä päivämäärän esitysmuoto"; "Time Format" = "Ajan esitysmuoto"; "default" = "Oletus"; "Default Module" = "Oletusmoduli"; @@ -121,7 +121,7 @@ "firstWeekOfYear_First4DayWeek" = "Ensimmäinen nelipäiväinen viikko"; "firstWeekOfYear_FirstFullWeek" = "Ensimmäinen täysi viikko"; "Prevent from being invited to appointments" = "Estä tapaamiskutsut"; -"White list for appointment invitations" = "Valkoinen lista kalenterikutsuille"; +"White list for appointment invitations" = "Valkoinen lista tapaamiskutsuille"; "Contacts Names" = "Yhteystietojen Nimet"; /* Default Calendar */ @@ -130,17 +130,17 @@ "personalCalendar" = "Henkilökohtainen kalenteri"; "firstCalendar" = "Ensimmäinen käyttöönotettu kalenteri"; "reminder_NONE" = "Ei muistutusta"; -"reminder_5_MINUTES_BEFORE" = "5 minuuttia"; -"reminder_10_MINUTES_BEFORE" = "10 minuuttia"; -"reminder_15_MINUTES_BEFORE" = "15 minuuttia"; -"reminder_30_MINUTES_BEFORE" = "30 minuuttia"; +"reminder_5_MINUTES_BEFORE" = "5 minuuttia ennen"; +"reminder_10_MINUTES_BEFORE" = "10 minuuttia ennen"; +"reminder_15_MINUTES_BEFORE" = "15 minuuttia ennen"; +"reminder_30_MINUTES_BEFORE" = "30 minuuttia ennen"; "reminder_45_MINUTES_BEFORE" = "45 minuuttia ennen"; -"reminder_1_HOUR_BEFORE" = "1 tunti"; -"reminder_2_HOURS_BEFORE" = "2 tuntia"; -"reminder_5_HOURS_BEFORE" = "5 tuntia"; -"reminder_15_HOURS_BEFORE" = "15 tuntia"; -"reminder_1_DAY_BEFORE" = "1 päivä"; -"reminder_2_DAYS_BEFORE" = "2 päivää"; +"reminder_1_HOUR_BEFORE" = "1 tunti ennen"; +"reminder_2_HOURS_BEFORE" = "2 tuntia ennen"; +"reminder_5_HOURS_BEFORE" = "5 tuntia ennen"; +"reminder_15_HOURS_BEFORE" = "15 tuntia ennen"; +"reminder_1_DAY_BEFORE" = "1 päivä ennen"; +"reminder_2_DAYS_BEFORE" = "2 päivää ennen"; "reminder_1_WEEK_BEFORE" = "Viikkoa ennen"; /* Mailer */ From 287c57c99493d0b396f25e2152bdc620f5a5adbe Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 12 Aug 2016 11:38:05 -0400 Subject: [PATCH 2/2] Restore SOGoMailAddOutgoingAddresses functionality --- NEWS | 12 ++++++++++++ SoObjects/Mailer/SOGoDraftObject.h | 2 +- SoObjects/Mailer/SOGoDraftObject.m | 5 ++--- UI/MailerUI/UIxMailEditor.m | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index d738f286d..a6c76bb5c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +3.1.6 (2016-MM-DD) +------------------ + +New features + - + +Enhancements + - + +Bug fixes + - [web] restored functionality to save unknown recipient emails to address book on send + 3.1.5 (2016-08-10) ------------------ diff --git a/SoObjects/Mailer/SOGoDraftObject.h b/SoObjects/Mailer/SOGoDraftObject.h index 0b1eeb93f..cf4e06d27 100644 --- a/SoObjects/Mailer/SOGoDraftObject.h +++ b/SoObjects/Mailer/SOGoDraftObject.h @@ -114,7 +114,7 @@ - (NSArray *) allBareRecipients; - (NSException *) delete; -/* - (NSException *) sendMail; */ +- (NSException *) sendMail; - (NSException *) sendMailAndCopyToSent: (BOOL) copyToSent; /* default: YES */ - (NSException *) save; diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index caf0f6363..c31239379 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -58,6 +58,7 @@ #import +#import #import #import @@ -1823,7 +1824,6 @@ static NSString *userAgent = nil; // // // -/* - (NSException *) sendMail { SOGoUserDefaults *ud; @@ -1838,7 +1838,7 @@ static NSString *userAgent = nil; SOGoContactGCSEntry *newContact; NGMailAddress *parsedRecipient; NGMailAddressParser *parser; - SOGoContactFolder *folder; + SOGoFolder *folder; NGVCard *card; int i; @@ -1885,7 +1885,6 @@ static NSString *userAgent = nil; } return [self sendMailAndCopyToSent: YES]; } -*/ // // diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m index 7ef694b10..767351b0b 100644 --- a/UI/MailerUI/UIxMailEditor.m +++ b/UI/MailerUI/UIxMailEditor.m @@ -864,7 +864,7 @@ static NSArray *infoKeys = nil; { error = [self validateForSend]; if (!error) - error = [co sendMailAndCopyToSent: YES]; + error = [co sendMail]; else error = [self failedToSaveFormResponse: [error reason]]; }