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

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Oct  2 16:03:43 2008
New Revision: 23979

URL: http://svn.erp5.org?rev=23979&view=rev
Log:
2008-10-2 yusei
* Fixed a bug on language selection. Remove country code from language tag.

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=23979&r1=23978&r2=23979&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  2 16:03:43 2008
@@ -63,9 +63,10 @@
 for item in context.WizardTool_getConfigurationLanguageList():\n
   configuration_language_list.append(item[1])\n
 accept_language = context.REQUEST.get(\'HTTP_ACCEPT_LANGUAGE\', \'en\')\n
-accept_language = accept_language.split(\';\')[0].split(\',\')[0]\n
-if accept_language in configuration_language_list:\n
-  return accept_language\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
 return \'en\'\n
 </string> </value>
         </item>
@@ -113,6 +114,8 @@
                             <string>item</string>
                             <string>_getitem_</string>
                             <string>accept_language</string>
+                            <string>accept_language_tag</string>
+                            <string>primary_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=23979&r1=23978&r2=23979&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_wizard/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_wizard/bt/change_log Thu Oct  2 16:03:43 2008
@@ -1,3 +1,6 @@
+2008-10-2 yusei
+* Fixed a bug on language selection. Remove country code from language tag.
+
 2008-10-1 vincentd
 * Add a js file for overwrite the js of normal access-tab (to access to the sales of Express products), and put a hight priority for
 the skin folder

Modified: erp5/trunk/bt5/erp5_wizard/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_wizard/bt/revision?rev=23979&r1=23978&r2=23979&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_wizard/bt/revision (original)
+++ erp5/trunk/bt5/erp5_wizard/bt/revision Thu Oct  2 16:03:43 2008
@@ -1,1 +1,1 @@
-105
+106