[Erp5-report] r21640 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: yusei
Date: Tue Jun 17 11:59:26 2008
New Revision: 21640

URL: http://svn.erp5.org?rev=21640&view=rev
Log:
2008-06-17 yusei
* Revert previous changes of Base_doLanguage, because this causes another problem.

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/change_log
    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=21640&r1=21639&r2=21640&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml Tue Jun 17 11:59:26 2008
@@ -65,28 +65,10 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-# XXX Localizer-dependent\n
+            <value> <string># XXX Localizer-dependent\n
 portal = context.getPortalObject()\n
-\n
-# Make the URL for the redirection. The language is appended, because when HTTP caching is utilized,\n
-# If-Modified-Since ignores Vary, so the URL must be different from another language. Note that this\n
-# is still a kind of hack, because the language is not appended to other links.\n
-\n
-# XXX relying on the referer is a bad idea, but we don\'t have any other way to retrieve the original URL\n
-# currently.\n
-url = context.REQUEST[\'HTTP_REFERER\']\n
-if \'?\' in url:\n
-  delimiter = \'&\'\n
-else:\n
-  delimiter = \'?\'\n
-url = \'%s%sLOCALIZER_LANGUAGE=%s\' % (url, delimiter, select_language)\n
-\n
-portal.Localizer.changeLanguage(select_language, goto=url)\n
-
-
-]]></string> </value>
+portal.Localizer.changeLanguage(select_language)\n
+</string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -138,9 +120,6 @@
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>portal</string>
-                            <string>_getitem_</string>
-                            <string>url</string>
-                            <string>delimiter</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log?rev=21640&r1=21639&r2=21640&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log Tue Jun 17 11:59:26 2008
@@ -1,3 +1,6 @@
+2008-06-17 yusei
+* Revert previous changes of Base_doLanguage, because this causes another problem.
+
 2008-06-16 yusei
 * Fixed tabber_style.css to display border line under unselected tabs in the front page.
 

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=21640&r1=21639&r2=21640&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Tue Jun 17 11:59:26 2008
@@ -1,1 +1,1 @@
-557
+558