From 043624b59e1b363458aec5f0989c2ff1b6bbd68a Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 22 Oct 2007 22:25:03 +0000 Subject: [PATCH] Monotone-Parent: 45f5145837bf26807ee9a0b765cfdd2dbbd25518 Monotone-Revision: 7f6095f809b62253c184355dc35939b4fe3e2c53 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-10-22T22:25:03 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ UI/Common/UIxPageFrame.m | 3 +++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 73092666f..d23d7bad3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-10-22 Wolfgang Sourdeau + * UI/Common/UIxPageFrame.m ([UIxPageFrame -commonLocalizableStrings]) + ([UIxPageFrame -productLocalizableStrings]): invoke the new + +[SOGoUser language] method if the user is nil. + * SoObjects/SOGo/SOGoUser.m ([SOGoUser +language]): new method that returns any generically-found language. ([SoUser -language]): modified to call the above. diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index 447572b0b..efda984ef 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -179,6 +179,9 @@ frameworkName = [NSString stringWithFormat: @"%@.SOGo", (framework ? framework : [self frameworkName])]; language = [[context activeUser] language]; + if (!language) + language = [SOGoUser language]; + table = [[self resourceManager] stringTableWithName: @"Localizable" inFramework: frameworkName