From 5bb2c383262fed5273b2f6e753185e14ae461219 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 17 Oct 2008 23:41:27 +0000
Subject: [PATCH] Fix for bug #3038

Monotone-Parent: fd6739c8912ccda074f93108e73623ee0dcc2d1b
Monotone-Revision: f1a1a7d4fd101844877061fca124817c04fb68bb

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-10-17T23:41:27
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                     |  6 ++++++
 UI/Common/UIxPageFrame.h      |  2 ++
 UI/Common/UIxPageFrame.m      | 11 +++++++++++
 UI/Templates/UIxPageFrame.wox |  3 ++-
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ac479d260..13071ad0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-17  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Common/UIxPageFrame.m ([NSString userLanguage]): returns the
+	user's language. Used to make this information available through
+	JavaScript.
+
 2008-10-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -davURL])
diff --git a/UI/Common/UIxPageFrame.h b/UI/Common/UIxPageFrame.h
index 8545712c3..080f949bb 100644
--- a/UI/Common/UIxPageFrame.h
+++ b/UI/Common/UIxPageFrame.h
@@ -67,6 +67,8 @@
 
 - (BOOL) isSuperUser;
 
+- (NSString *) userLanguage;
+
 - (BOOL) isCompatibleBrowser;
 
 @end
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index bdf1a5f7c..11dd97d16 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -386,6 +386,17 @@
   return [user canAccessModule: @"Mail"];
 }
 
+- (NSString *) userLanguage
+{
+  NSString *language;
+
+  language = [[context activeUser] language];
+  if (!language)
+    language = [SOGoUser language];
+
+  return language;
+}
+
 /* browser/os identification */
 
 - (BOOL) isCompatibleBrowser
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 7773eaef3..7625fa6b6 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -109,7 +109,8 @@
 	    <var:if condition="shortUserNameForDisplay" const:value="anonymous"
 	      const:negate="YES"
 	      >var UserFolderURL = '<var:string value="userFolderPath" />';
-	      var UserLogin = '<var:string value="shortUserNameForDisplay" />';</var:if>
+	      var UserLogin = '<var:string value="shortUserNameForDisplay" />';
+	      var UserLanguage = '<var:string value="userLanguage" />';</var:if>
 	    <var:string value="commonLocalizableStrings" const:escapeHTML="NO"/>
 	    <var:string value="productLocalizableStrings" const:escapeHTML="NO"/>
 	  </script>