Fix usage of browser's language for the login page
parent
0124191329
commit
8db5e6d224
|
@ -44,18 +44,18 @@
|
||||||
|
|
||||||
languages = [NSMutableArray array];
|
languages = [NSMutableArray array];
|
||||||
user = [self activeUser];
|
user = [self activeUser];
|
||||||
if ([user isKindOfClass: [SOGoUser class]])
|
if (!user || [[user login] isEqualToString: @"anonymous"])
|
||||||
|
{
|
||||||
|
browserLanguages = [[self request] browserLanguages];
|
||||||
|
[languages addObjectsFromArray: browserLanguages];
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
language = [[user userDefaults] language];
|
language = [[user userDefaults] language];
|
||||||
[languages addObject: language];
|
[languages addObject: language];
|
||||||
language = [[user domainDefaults] language];
|
language = [[user domainDefaults] language];
|
||||||
[languages addObject: language];
|
[languages addObject: language];
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
browserLanguages = [[self request] browserLanguages];
|
|
||||||
[languages addObjectsFromArray: browserLanguages];
|
|
||||||
}
|
|
||||||
|
|
||||||
// if (activeUser && [activeUser language])
|
// if (activeUser && [activeUser language])
|
||||||
// [languages addObject: [activeUser language]];
|
// [languages addObject: [activeUser language]];
|
||||||
|
|
Loading…
Reference in New Issue