From f1ffcac38913837ced594a66b7854e0eff6b530e Mon Sep 17 00:00:00 2001 From: C Robert Date: Thu, 1 Oct 2009 21:41:54 +0000 Subject: [PATCH] Mantis 138: Language should be configurable from the preferences Monotone-Parent: eeaca1eda9abc5d3662e0a63336edf2734aa9216 Monotone-Revision: 43ac2f2aa838034f00194247d4c245926ed738de Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-10-01T21:41:54 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ .../Localizable.strings | 14 +++++++++++ .../Czech.lproj/Localizable.strings | 14 +++++++++++ .../Dutch.lproj/Localizable.strings | 14 +++++++++++ .../English.lproj/Localizable.strings | 14 +++++++++++ .../French.lproj/Localizable.strings | 14 +++++++++++ .../German.lproj/Localizable.strings | 13 +++++++++++ .../Hungarian.lproj/Localizable.strings | 13 +++++++++++ .../Italian.lproj/Localizable.strings | 13 +++++++++++ .../Russian.lproj/Localizable.strings | 13 +++++++++++ .../Spanish.lproj/Localizable.strings | 13 +++++++++++ UI/PreferencesUI/UIxPreferences.m | 23 +++++++++++++++++++ .../Welsh.lproj/Localizable.strings | 13 +++++++++++ UI/Templates/PreferencesUI/UIxPreferences.wox | 6 +++++ UI/WebServerResources/UIxPreferences.js | 3 ++- 15 files changed, 182 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 98e380da1..fa7b37f58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ received, references, davDisplayName, to * Tests/test-maildav.py (testPROPFIND): Added tests for the new MailDAV PROPFIND. + * UI/PreferencesUI/UIxPreferences.m (languages, language, setLanguage:, + languageText): Added to support changing the language from the Preferences + dialog. 2009-10-01 Cyril Robert diff --git a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings index 6e17d7db3..5b06a9e3f 100644 --- a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings @@ -122,3 +122,17 @@ "Mail" = "Mail"; "Last" = "Last used"; "Default module :" = "Default module :"; + +"Language :" = "Idioma :"; +"choose" = "Escolha ..."; +"Czech" = "Česky"; +"Dutch" = "Nederlands"; +"English" = "English"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Italian" = "Italiano"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Spanish" = "Español"; +"Welsh" = "Cymraeg"; diff --git a/UI/PreferencesUI/Czech.lproj/Localizable.strings b/UI/PreferencesUI/Czech.lproj/Localizable.strings index b368c7773..04d97f41b 100644 --- a/UI/PreferencesUI/Czech.lproj/Localizable.strings +++ b/UI/PreferencesUI/Czech.lproj/Localizable.strings @@ -122,3 +122,17 @@ "Mail" = "Mail"; "Last" = "Last used"; "Default module :" = "Default module :"; + +"Language :" = "Jazyk :"; +"choose" = "Vybrat ..."; +"Czech" = "Česky"; +"Dutch" = "Nederlands"; +"English" = "English"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Italian" = "Italiano"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Spanish" = "Español"; +"Welsh" = "Cymraeg"; diff --git a/UI/PreferencesUI/Dutch.lproj/Localizable.strings b/UI/PreferencesUI/Dutch.lproj/Localizable.strings index daadd4f61..e4c432244 100644 --- a/UI/PreferencesUI/Dutch.lproj/Localizable.strings +++ b/UI/PreferencesUI/Dutch.lproj/Localizable.strings @@ -117,3 +117,17 @@ "Mail" = "Mail"; "Last" = "Last used"; "Default module :" = "Default module :"; + +"Language :" = "Taal :"; +"choose" = "Kies..."; +"Czech" = "Česky"; +"Dutch" = "Nederlands"; +"English" = "English"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Italian" = "Italiano"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Spanish" = "Español"; +"Welsh" = "Cymraeg"; diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings index 4eb78b818..9ff0682a1 100644 --- a/UI/PreferencesUI/English.lproj/Localizable.strings +++ b/UI/PreferencesUI/English.lproj/Localizable.strings @@ -122,3 +122,17 @@ "Mail" = "Mail"; "Last" = "Last used"; "Default module :" = "Default module :"; + +"Language :" = "Language :"; +"choose" = "Choose ..."; +"Czech" = "Česky"; +"Dutch" = "Nederlands"; +"English" = "English"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Italian" = "Italiano"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Spanish" = "Español"; +"Welsh" = "Cymraeg"; diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings index 5822d01bf..98d6539ee 100644 --- a/UI/PreferencesUI/French.lproj/Localizable.strings +++ b/UI/PreferencesUI/French.lproj/Localizable.strings @@ -118,3 +118,17 @@ "Mail" = "Courrier"; "Last" = "Dernier utilisé"; "Default module :" = "Module par défaut :"; + +"Language :" = "Langue :"; +"choose" = "Choisir ..."; +"Czech" = "Česky"; +"Dutch" = "Nederlands"; +"English" = "English"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Italian" = "Italiano"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Spanish" = "Español"; +"Welsh" = "Cymraeg"; diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings index e0ce4a5b0..9e0321daa 100644 --- a/UI/PreferencesUI/German.lproj/Localizable.strings +++ b/UI/PreferencesUI/German.lproj/Localizable.strings @@ -119,3 +119,16 @@ "Last" = "Last used"; "Default module :" = "Default module :"; +"Language :" = "Sprache :"; +"choose" = "Auswählen"; +"Czech" = "Česky"; +"Dutch" = "Nederlands"; +"English" = "English"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Italian" = "Italiano"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Spanish" = "Español"; +"Welsh" = "Cymraeg"; diff --git a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings index 997564630..d243c9e03 100644 --- a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings @@ -123,3 +123,16 @@ "Last" = "Last used"; "Default module :" = "Default module :"; +"Language :" = "Nyelv :"; +"choose" = "Válasszon ..."; +"Czech" = "Česky"; +"Dutch" = "Nederlands"; +"English" = "English"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Italian" = "Italiano"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Spanish" = "Español"; +"Welsh" = "Cymraeg"; diff --git a/UI/PreferencesUI/Italian.lproj/Localizable.strings b/UI/PreferencesUI/Italian.lproj/Localizable.strings index 4cc33394e..3b5e2b261 100644 --- a/UI/PreferencesUI/Italian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Italian.lproj/Localizable.strings @@ -123,3 +123,16 @@ "Last" = "Last used"; "Default module :" = "Default module :"; +"Language :" = "Lingua :"; +"choose" = "Scegli..."; +"Czech" = "Česky"; +"Dutch" = "Nederlands"; +"English" = "English"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Italian" = "Italiano"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Spanish" = "Español"; +"Welsh" = "Cymraeg"; diff --git a/UI/PreferencesUI/Russian.lproj/Localizable.strings b/UI/PreferencesUI/Russian.lproj/Localizable.strings index 509d914be..5c64f6744 100644 --- a/UI/PreferencesUI/Russian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Russian.lproj/Localizable.strings @@ -124,3 +124,16 @@ "Last" = "Last used"; "Default module :" = "Default module :"; +"Language :" = "Язык :"; +"choose" = "Выбрать ..."; +"Czech" = "Česky"; +"Dutch" = "Nederlands"; +"English" = "English"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Italian" = "Italiano"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Spanish" = "Español"; +"Welsh" = "Cymraeg"; diff --git a/UI/PreferencesUI/Spanish.lproj/Localizable.strings b/UI/PreferencesUI/Spanish.lproj/Localizable.strings index 92e31c6d7..dd76cde0a 100644 --- a/UI/PreferencesUI/Spanish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Spanish.lproj/Localizable.strings @@ -130,3 +130,16 @@ "Last" = "Last used"; "Default module :" = "Default module :"; +"Language :" = "Language :"; +"choose" = "Choose ..."; +"Czech" = "Česky"; +"Dutch" = "Nederlands"; +"English" = "English"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Italian" = "Italiano"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Spanish" = "Español"; +"Welsh" = "Cymraeg"; diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index 1fd64a379..cf1591e4b 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -827,4 +827,27 @@ static BOOL defaultShowSubscribedFoldersOnly = NO; } +- (NSArray *) languages +{ + return [NSArray arrayWithObjects: @"Czech", @"Dutch", @"English", @"French", + @"German", @"Hungarian", @"Italian", @"BrazilianPortuguese", + @"Russian", @"Spanish", @"Welsh", nil]; +} + +- (NSString *) language +{ + return [userDefaults objectForKey: @"Language"]; +} + +- (void) setLanguage: (NSString *) newLanguage +{ + if ([[self languages] containsObject: newLanguage]) + [userDefaults setObject: newLanguage forKey: @"Language"]; +} + +- (NSString *) languageText +{ + return [self labelForKey: item]; +} + @end diff --git a/UI/PreferencesUI/Welsh.lproj/Localizable.strings b/UI/PreferencesUI/Welsh.lproj/Localizable.strings index 2d56e0dcc..d2bf44504 100644 --- a/UI/PreferencesUI/Welsh.lproj/Localizable.strings +++ b/UI/PreferencesUI/Welsh.lproj/Localizable.strings @@ -123,3 +123,16 @@ "Last" = "Last used"; "Default module :" = "Default module :"; +"Language :" = "Iaith :"; +"choose" = "Dewis ..."; +"Czech" = "Česky"; +"Dutch" = "Nederlands"; +"English" = "English"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Italian" = "Italiano"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Spanish" = "Español"; +"Welsh" = "Cymraeg"; diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox index 7e32aae3b..1928b2a13 100644 --- a/UI/Templates/PreferencesUI/UIxPreferences.wox +++ b/UI/Templates/PreferencesUI/UIxPreferences.wox @@ -35,6 +35,12 @@
+