From c1008ff7070188e434ede218d97bd97b83a7702b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Wed, 6 Oct 2010 15:23:13 +0000
Subject: [PATCH] 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

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38930 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_skins/erp5_xhtml_style/Base_doLanguage.xml     | 8 ++++----
 product/ERP5/bootstrap/erp5_xhtml_style/bt/revision       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml
index 4d78215d04..4a9047ae3b 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml
@@ -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>
@@ -87,6 +84,9 @@ else:\n
 \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>
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index 67d892c80f..bc37cf331b 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-1028
\ No newline at end of file
+1029
\ No newline at end of file
-- 
2.30.9