From 8db5e6d22439ccef5defbc6385896ef349acd69e Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 13 Dec 2012 08:53:50 -0500 Subject: [PATCH] Fix usage of browser's language for the login page --- SoObjects/SOGo/WOContext+SOGo.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SoObjects/SOGo/WOContext+SOGo.m b/SoObjects/SOGo/WOContext+SOGo.m index 2d0fbbb15..e5f992ccf 100644 --- a/SoObjects/SOGo/WOContext+SOGo.m +++ b/SoObjects/SOGo/WOContext+SOGo.m @@ -44,18 +44,18 @@ languages = [NSMutableArray array]; 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]; [languages addObject: language]; language = [[user domainDefaults] language]; [languages addObject: language]; } - else - { - browserLanguages = [[self request] browserLanguages]; - [languages addObjectsFromArray: browserLanguages]; - } // if (activeUser && [activeUser language]) // [languages addObject: [activeUser language]];