Changeset 2f8f40 in indico

Timestamp:

02/22/11 15:27:10 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

88f40b

Parents:

e6d9f55

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (02/21/11 13:16:14)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/22/11 15:27:10)

Message:

[IMP] Allow changing the locale via lang=... param

• fixes #663

Location:

indico/MaKaC/webinterface/rh

Files:

• base.py (modified) (3 diffs)
• lang.py (modified) (2 diffs)

indico/MaKaC/webinterface/rh/base.py

@@ -55 +55 @@
 from MaKaC.common.logger import Logger
 from MaKaC.common.contextManager import ContextManager
-from MaKaC.i18n import _
+from MaKaC.i18n import _, langList
 
 from MaKaC.plugins.base import PluginsHolder
@@ -97 +97 @@
         return self._uh.getURL( self._target )
 
-    def _setLang(self):
+    def _setLang(self, params):
+
+        # allow to choose the lang from params
+        if 'lang' in params:
+            newLang = params.get('lang', '')
+            for lang in langList():
+                if newLang.lower() == lang[0].lower():
+                    self._websession.setLang(lang[0])
+                    break
+
         lang=self._websession.getLang()
         Logger.get('i18n').debug("lang:%s"%lang)
@@ -472 +481 @@
                         #raise(str(dir(self._websession)))
                         self._setSessionUser()
-                        self._setLang()
+                        self._setLang(params)
 
                         if self._getUser():

indico/MaKaC/webinterface/rh/lang.py

@@ -1 +1 @@
 #import syslog
+import re
 from MaKaC.common import DBMgr
 import MaKaC.webinterface.rh.base as base
@@ -6 +7 @@
 
 class RHChangeLang(base.RH):
-    
+
     def _process(self):
         params = self._getRequestParams()
-        self._websession.setLang(params.get("lang",""))
-        self._redirect(params['REFERER_URL'], noCache=True)
+        # No need to do any processing here. The language change is processed in RH base
+        # Remove lang param from referer
+        referer = re.sub(r'(?<=[&?])lang=[^&]*&?', '', params['REFERER_URL'])
+        referer = re.sub(r'[?&]$', '', referer)
+        self._redirect(referer, noCache=True)