amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-13 10:53:18 +00:00
Code Issues Projects Releases Wiki Activity

Various improvements to the Preferences module

Browse Source 
Monotone-Parent: f5af4bb05528ecf5545e12a51e343876ffad7270
Monotone-Revision: 997781056d484980738b11e151b8156a66f0998b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-08-06T19:07:25
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-08-06 19:07:25 +00:00
parent 8bf4515d6f
commit c3ff1d6c6e
17 changed files with 119 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
+2
View File
@@ -97,6 +97,8 @@
"signatureplacement_above" = "abaixo da minha resposta";
"signatureplacement_below" = "abaixo da citação";
"composeMessageChanged" = "Changing your messages composition type requires to save your preferences immediately. Continue?";
/* Additional Parameters */
"Additional Parameters" = "Parâmetros Adicionais";
UI/PreferencesUI/Czech.lproj/Localizable.strings
+2
View File
@@ -97,6 +97,8 @@
"signatureplacement_above" = "pod odpověď";
"signatureplacement_below" = "pod citaci";
"composeMessageChanged" = "Changing your messages composition type requires to save your preferences immediately. Continue?";
/* Additional Parameters */
"Additional Parameters" = "Dodatečné parametry";
UI/PreferencesUI/Dutch.lproj/Localizable.strings
+2
View File
@@ -97,6 +97,8 @@
"composemessagestype_html" = "HTML";
"composemessagestype_text" = "Plain text";
"composeMessageChanged" = "Changing your messages composition type requires to save your preferences immediately. Continue?";
/* Additional Parameters */
"Additional Parameters" = "Extra Parameters";
UI/PreferencesUI/English.lproj/Localizable.strings
+3
View File
@@ -88,6 +88,7 @@
"messageforward_inline" = "Inline";
"messageforward_attached" = "As Attachment";
/* Identities */
"Default identity:" = "Default identity:";
"Manage identities..." = "Manage identities...";
"Signature" = "Signature";
@@ -100,6 +101,8 @@
"composemessagestype_html" = "HTML";
"composemessagestype_text" = "Plain text";
"composeMessageChanged" = "Changing your messages composition type requires to save your preferences immediately. Continue?";
/* Additional Parameters */
"Additional Parameters" = "Additional Parameters";
UI/PreferencesUI/French.lproj/Localizable.strings
+2
View File
@@ -98,6 +98,8 @@
"composemessagestype_html" = "HTML";
"composemessagestype_text" = "Texte";
"composeMessageChanged" = "Changer la composition des messages nécessite d'enregistrer immédiatement vos préférences. Voulez-vous continuez?";
/* Additional Parameters */
"Additional Parameters" = "Paramètres supplémentaires";
UI/PreferencesUI/German.lproj/Localizable.strings
+2
View File
@@ -98,6 +98,8 @@
"composemessagestype_html" = "HTML";
"composemessagestype_text" = "Plain text";
"composeMessageChanged" = "Changing your messages composition type requires to save your preferences immediately. Continue?";
/* Additional Parameters */
"Additional Parameters" = "Zusätzliche Einstellungen";
UI/PreferencesUI/Hungarian.lproj/Localizable.strings
+2
View File
@@ -95,6 +95,8 @@
"composemessagestype_html" = "HTML";
"composemessagestype_text" = "Egyszerű szöveg";
"composeMessageChanged" = "Changing your messages composition type requires to save your preferences immediately. Continue?";
/* Additional Parameters */
"Additional Parameters" = "További beállítások";
UI/PreferencesUI/Italian.lproj/Localizable.strings
+2
View File
@@ -98,6 +98,8 @@
"composemessagestype_html" = "HTML";
"composemessagestype_text" = "Plain text";
"composeMessageChanged" = "Changing your messages composition type requires to save your preferences immediately. Continue?";
/* Additional Parameters */
"Additional Parameters" = "Parametri addizionali";
UI/PreferencesUI/Spanish.lproj/Localizable.strings
+2
View File
@@ -109,6 +109,8 @@
"composemessagestype_html" = "HTML";
"composemessagestype_text" = "Plain text";
"composeMessageChanged" = "Changing your messages composition type requires to save your preferences immediately. Continue?";
/* Additional Parameters */
"Additional Parameters" = "Additional Parameters";
UI/PreferencesUI/UIxPreferences.h
+1 -1
View File
@@ -39,7 +39,7 @@
NSCalendarDate *today;
NSMutableArray *hours;
NSArray *daysOfWeek;
BOOL hasChanged;
BOOL hasChanged, composeMessageTypeHasChanged;
}
@end
UI/PreferencesUI/UIxPreferences.m
+17 -5
View File
@@ -87,6 +87,7 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
ASSIGN (daysOfWeek,
[locale objectForKey: NSWeekDayNameArray]);
hasChanged = NO;
composeMessageTypeHasChanged = NO;
}
return self;
@@ -633,7 +634,11 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
- (void) setUserComposeMessagesType: (NSString *) newType
{
[userDefaults setObject: newType forKey: @"ComposeMessagesType"];
if (![[self userComposeMessagesType] isEqualToString: newType])
{
composeMessageTypeHasChanged = YES;
[userDefaults setObject: newType forKey: @"ComposeMessagesType"];
}
}
@@ -652,11 +657,18 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
if ([[request method] isEqualToString: @"POST"])
{
[userDefaults synchronize];
if (hasChanged)
method = @"window.location.reload()";
if (composeMessageTypeHasChanged)
// Due to a limitation of CKEDITOR, we reload the page when the user
// changes the composition mode to avoid Javascript errors.
results = self;
else
method = nil;
results = [self jsCloseWithRefreshMethod: method];
{
if (hasChanged)
method = @"window.location.reload()";
else
method = nil;
results = [self jsCloseWithRefreshMethod: method];
}
}
else
results = self;
UI/PreferencesUI/Welsh.lproj/Localizable.strings
+2
View File
@@ -100,6 +100,8 @@
"composemessagestype_html" = "HTML";
"composemessagestype_text" = "Plain text";
"composeMessageChanged" = "Changing your messages composition type requires to save your preferences immediately. Continue?";
/* Additional Parameters */
"Additional Parameters" = "Additional Parameters";