[Erp5-report] r24122 - in /erp5/trunk/bt5/erp5_wizard: SkinTemplateItem/portal_skins/erp5_w...

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Oct  9 14:59:44 2008
New Revision: 24122

URL: http://svn.erp5.org?rev=24122&view=rev
Log:
2008-10-9 yusei
* Handle HTTP_ACCEPT_LANGUAGE better.

Modified:
    erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_getUserPreferredLanguage.xml
    erp5/trunk/bt5/erp5_wizard/bt/change_log
    erp5/trunk/bt5/erp5_wizard/bt/revision

Modified: erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_getUserPreferredLanguage.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_getUserPreferredLanguage.xml?rev=24122&r1=24121&r2=24122&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_getUserPreferredLanguage.xml (original)
+++ erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_getUserPreferredLanguage.xml Thu Oct  9 14:59:44 2008
@@ -66,11 +66,13 @@
 configuration_language_list = []\n
 for item in context.WizardTool_getConfigurationLanguageList():\n
   configuration_language_list.append(item[1])\n
-accept_language = REQUEST.get(\'HTTP_ACCEPT_LANGUAGE\', \'en\')\n
-accept_language_tag = accept_language.split(\';\')[0].split(\',\')[0]\n
-primary_language = accept_language_tag.split(\'-\')[0]\n
-if primary_language in configuration_language_list:\n
-  return primary_language\n
+http_accept_language = REQUEST.get(\'HTTP_ACCEPT_LANGUAGE\', \'en\')\n
+\n
+for language_set in http_accept_language.split(\',\'):\n
+  language_tag = language_set.split(\';\')[0]\n
+  language = language_tag.split(\'-\')[0]\n
+  if language in configuration_language_list:\n
+    return language\n
 return \'en\'\n
 </string> </value>
         </item>
@@ -118,9 +120,10 @@
                             <string>_getiter_</string>
                             <string>item</string>
                             <string>_getitem_</string>
-                            <string>accept_language</string>
-                            <string>accept_language_tag</string>
-                            <string>primary_language</string>
+                            <string>http_accept_language</string>
+                            <string>language_set</string>
+                            <string>language_tag</string>
+                            <string>language</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_wizard/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_wizard/bt/change_log?rev=24122&r1=24121&r2=24122&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_wizard/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_wizard/bt/change_log Thu Oct  9 14:59:44 2008
@@ -1,3 +1,6 @@
+2008-10-9 yusei
+* Handle HTTP_ACCEPT_LANGUAGE better.
+
 2008-10-06 ivan
 * User server side rendered messages (for i18n)
 

Modified: erp5/trunk/bt5/erp5_wizard/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_wizard/bt/revision?rev=24122&r1=24121&r2=24122&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_wizard/bt/revision (original)
+++ erp5/trunk/bt5/erp5_wizard/bt/revision Thu Oct  9 14:59:44 2008
@@ -1,1 +1,1 @@
-127
+128