[Erp5-report] r28318 - in /erp5/trunk: bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Aug 10 11:24:06 CEST 2009
Author: kazuhiko
Date: Mon Aug 10 11:24:06 2009
New Revision: 28318
URL: http://svn.erp5.org?rev=28318&view=rev
Log:
merge erp5_web's Base_doLanguage into erp5_xhtml_style.
Added:
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doLanguage.xml
- copied unchanged from r28315, erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_doLanguage.xml
Removed:
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_doLanguage.xml
Modified:
erp5/trunk/bt5/erp5_web/bt/revision
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
Removed: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_doLanguage.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_doLanguage.xml?rev=28317&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_doLanguage.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_doLanguage.xml (removed)
@@ -1,171 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string>try:\n
- website = context.getWebSiteValue()\n
-except AttributeError:\n
- website = None\n
-\n
-if website is not None and website.isStaticLanguageSelection():\n
- # Web Mode\n
- referer_url = context.REQUEST.HTTP_REFERER\n
- default_language = context.getDefaultAvailableLanguage()\n
- current_language = context.Localizer.get_selected_language()\n
- web_site_url = context.getWebSiteValue().absolute_url()\n
- if web_site_url.endswith(\'/%s\' % current_language):\n
- # Quick hack to handle acquisition of temp object\n
- # which is different in the case of a Web Site\n
- web_site_url = web_site_url[:-len(current_language) - 1]\n
-\n
- if current_language == select_language:\n
- redirect_url = referer_url\n
- elif current_language == default_language:\n
- redirect_url = referer_url.replace(web_site_url, \'%s/%s\' %\n
- (web_site_url, select_language))\n
- elif select_language == default_language:\n
- redirect_url = referer_url.replace(\'%s/%s\' % (web_site_url, current_language), web_site_url)\n
- else:\n
- redirect_url = referer_url.replace(\'%s/%s\' % (web_site_url, current_language),\n
- \'%s/%s\' % (web_site_url, select_language))\n
- return context.REQUEST.RESPONSE.redirect(redirect_url)\n
-else:\n
- # ERP5 Mode\n
- # XXX Localizer-dependent\n
- portal = context.getPortalObject()\n
-\n
- if select_language is None:\n
- select_language = context.REQUEST.form["Base_doLanguage"]\n
-\n
- portal.Localizer.changeLanguage(select_language)\n
-</string> </value>
- </item>
- <item>
- <key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>select_language=None</string> </value>
- </item>
- <item>
- <key> <string>errors</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>func_code</string> </key>
- <value>
- <object>
- <klass>
- <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>co_argcount</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>co_varnames</string> </key>
- <value>
- <tuple>
- <string>select_language</string>
- <string>_getattr_</string>
- <string>context</string>
- <string>website</string>
- <string>AttributeError</string>
- <string>None</string>
- <string>referer_url</string>
- <string>default_language</string>
- <string>current_language</string>
- <string>web_site_url</string>
- <string>_getitem_</string>
- <string>len</string>
- <string>redirect_url</string>
- <string>portal</string>
- </tuple>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>func_defaults</string> </key>
- <value>
- <tuple>
- <none/>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Base_doLanguage</string> </value>
- </item>
- <item>
- <key> <string>warnings</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=28318&r1=28317&r2=28318&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Mon Aug 10 11:24:06 2009
@@ -1,1 +1,1 @@
-833
+834
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=28318&r1=28317&r2=28318&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] Mon Aug 10 11:24:06 2009
@@ -1,1 +1,1 @@
-798
+799
More information about the Erp5-report
mailing list