Changeset 7678

Timestamp:

22 Feb 2012, 11:37:37 (13 years ago)

Author:

Henrik Bettermann

Message:

Let's define the portal language in our global utility SIRPUtils.

Location:

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

Files:

• language.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -18 +18 @@
 
 import grokcore.component
+from zope.component import getUtility
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.i18n.interfaces import IUserPreferredLanguages
 from waeup.sirp.configuration import ConfigurationContainer
+from waeup.sirp.interfaces import ISIRPUtils
 
 class SIRPLanguage(grokcore.component.Adapter):
-    """Set portal and preferred languages"""
+    """Set preferred languages"""
     grokcore.component.context(IBrowserRequest)
     grokcore.component.implements(IUserPreferredLanguages)
-    # 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):
+        portal_language = getUtility(ISIRPUtils).PORTAL_LANGUAGE
+
         # This an adapter for the request, so self.context is the request.
         request = self.context
 
         # Extract the preferred language from a cookie:
-        lang = request.cookies.get('sirp.language', self.portal_language)
+        lang = request.cookies.get('sirp.language', portal_language)
 
         # According to IUserPreferredLanguages, we must return a list.

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

@@ -36 +36 @@
 
 class SIRPUtils(grok.GlobalUtility):
-    """A collection of methods subject to customization.
+    """A collection of parameters and methods subject to customization.
     """
     grok.implements(ISIRPUtils)
+    # 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 sendContactForm(self,from_name,from_addr,rcpt_name,rcpt_addr,