2008-10-2 yusei

* Fixed a bug on language selection. Remove country code from language tag.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23979 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_getUserPreferredLanguage.xml

@@ -63,9 +63,10 @@ if user_preferred_language is not None:\n
 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 @@ return \'en\'\n
                             <string>item</string>
                             <string>_getitem_</string>
                             <string>accept_language</string>
+                            <string>accept_language_tag</string>
+                            <string>primary_language</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_wizard/bt/change_log

+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

bt5/erp5_wizard/bt/revision

-105
+106
\ No newline at end of file