[Erp5-report] r38930 jerome - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: Skin...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Oct  6 17:23:13 2010
New Revision: 38930

URL: http://svn.erp5.org?rev=38930&view=rev
Log:
When the user selects "My Language" in the languages drop down, stay on the current language instead of setting  a cookie of "" that will select another language

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml?rev=38930&r1=38929&r2=38930&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml [utf8] Wed Oct  6 17:23:13 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -88,6 +85,9 @@ else:\n
   if select_language is None:\n
     select_language = context.REQUEST.form["Base_doLanguage"]\n
 \n
+  if not select_language:\n
+    select_language = portal.Localizer.get_selected_language()\n
+\n
   portal.Localizer.changeLanguage(select_language)\n
 </string> </value>
         </item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=38930&r1=38929&r2=38930&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Wed Oct  6 17:23:13 2010
@@ -1 +1 @@
-1028
\ No newline at end of file
+1029
\ No newline at end of file