[Erp5-report] r23989 - /erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Oct  2 17:51:34 2008
New Revision: 23989

URL: http://svn.erp5.org?rev=23989&view=rev
Log:
Set user's preferred language value to request so that next page after login can use the language value.

Modified:
    erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py

Modified: erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py?rev=23989&r1=23988&r2=23989&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py (original)
+++ erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py Thu Oct  2 17:51:34 2008
@@ -53,6 +53,9 @@
 installation_status = {'bt5': {'current': 0,
                                'all': 0,},
                        'activity_list': [],}
+
+# cookie name to store user's preferred language name
+LANGUAGE_COOKIE_NAME = 'configurator_user_preferred_language'
 
 def _isUserAcknowledged(cookiejar):
   """ Is user authenticated to remote system through a cookie. """
@@ -428,7 +431,7 @@
     configurator_user_preferred_language = 'en'
     if REQUEST is not None:
       # language value will be in cookie or REQUEST itself.
-      configurator_user_preferred_language = REQUEST.get('configurator_user_preferred_language', configurator_user_preferred_language)
+      configurator_user_preferred_language = REQUEST.get(LANGUAGE_COOKIE_NAME, configurator_user_preferred_language)
     parameter_dict['user_preferred_language'] = configurator_user_preferred_language
 
   def _updateParameterDictWithFileUpload(self, parameter_dict):
@@ -582,7 +585,11 @@
       # set user preferred configuration language
       user_preferred_language = REQUEST.get('field_my_user_preferred_language', None)
       if user_preferred_language:
-        REQUEST.RESPONSE.setCookie('configurator_user_preferred_language',
+        # Set language value to request so that next page after login
+        # can get the value. Because cookie value is available from
+        # next request.
+        REQUEST.set(LANGUAGE_COOKIE_NAME, user_preferred_language)
+        REQUEST.RESPONSE.setCookie(LANGUAGE_COOKIE_NAME,
                                    user_preferred_language,
                                    expires=(DateTime()+30).rfc822())
       # set encoded __ac_express cookie at client's browser