Changeset 7676

Timestamp:

22 Feb 2012, 10:33:27 (13 years ago)

Author:

Henrik Bettermann

Message:

Define portal language in SIRPLanguage adapter, not yet needed, but we will in the future.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/pages.py (modified) (1 diff)
• language.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -198 +198 @@
 
     def update(self, lang='en', view_name='@@index'):
-        self.response.setCookie('waeup.sirp.language', lang, path='/')
+        self.response.setCookie('sirp.language', lang, path='/')
         self.redirect(self.url(self.context, view_name))
         return

main/waeup.sirp/trunk/src/waeup/sirp/language.py

@@ -20 +20 @@
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.i18n.interfaces import IUserPreferredLanguages
+from waeup.sirp.configuration import ConfigurationContainer
 
 class SIRPLanguage(grokcore.component.Adapter):
-    """Extract the preferred language"""
+    """Set portal and preferred languages"""
     grokcore.component.context(IBrowserRequest)
     grokcore.component.implements(IUserPreferredLanguages)
-
-    # No need to implement __init__, it's already provided by the base class.
+    # This the only place where we define the portal language
+    # which is used for the translation of system messages
+    # (e.g. object histories).
+    portal_language = 'en'
 
     def getPreferredLanguages(self):
@@ -33 +36 @@
 
         # Extract the preferred language from a cookie:
-        lang = request.cookies.get('waeup.sirp.language', 'en')
+        lang = request.cookies.get('sirp.language', self.portal_language)
 
         # According to IUserPreferredLanguages, we must return a list.