See ChangeLog.

Monotone-Parent: 9cb63fedb848baac983ef94694d11b7e242eef67
Monotone-Revision: 00387fb21eaf4cb1b4d1ece522a38e6417a162c1

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-06-23T18:13:48
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-06-23 18:13:48 +00:00
parent 48658b2741
commit 96a59133c4
3 changed files with 24 additions and 3 deletions
+8 -1
View File
@@ -346,11 +346,18 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
- (NSString *) language
{
NSString *language;
NSArray *supportedLanguages;
/* see SOGoDomainDefaults for the meaning of this */
language = [source objectForKey: @"SOGoLanguage"];
if (!(language && [language isKindOfClass: [NSString class]]))
language = [(SOGoDomainDefaults *) parentSource language];
/* make sure the language is part of the supported languages */
supportedLanguages = [[SOGoSystemDefaults sharedSystemDefaults]
supportedLanguages];
if (![supportedLanguages containsObject: language])
language = [parentSource stringForKey: @"SOGoLanguage"];
return language;
}