[Erp5-report] r29520 - in /erp5/trunk/bt5/tiolive_base: SkinTemplateItem/portal_skins/tioli...

[nobody at svn.erp5.org]

Author: seb
Date: Fri Oct  9 14:13:41 2009
New Revision: 29520

URL: http://svn.erp5.org?rev=29520&view=rev
Log:
2009-10-09 Seb
* Keep user prefered language while switching to another place

Modified:
    erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml
    erp5/trunk/bt5/tiolive_base/bt/revision

Modified: erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml?rev=29520&r1=29519&r2=29520&view=diff
==============================================================================
--- erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml [utf8] (original)
+++ erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml [utf8] Fri Oct  9 14:13:41 2009
@@ -56,7 +56,18 @@
             <value> <string>"""\n
   Get TioLive Site root URL.\n
 """\n
-return context.REQUEST.get(\'BASE0\', \'https://www.tiolive.com\')\n
+root_url = context.REQUEST.get(\'BASE0\', \'https://www.tiolive.com\')\n
+language = context.Localizer.get_selected_language()\n
+\n
+# This is far from perfect, to add language all the time\n
+# in the url, because default languages of\n
+# websites are usually not included in the url. But this\n
+# script is also used in tiolive instances, and from them\n
+# it is impossible to have the configuration of the web site\n
+if language is not None:\n
+  root_url = "%s/%s" % (root_url, language)\n
+  \n
+return root_url\n
 </string> </value>
         </item>
         <item>
@@ -95,6 +106,9 @@
                           <tuple>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>root_url</string>
+                            <string>language</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/tiolive_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/tiolive_base/bt/revision?rev=29520&r1=29519&r2=29520&view=diff
==============================================================================
--- erp5/trunk/bt5/tiolive_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/tiolive_base/bt/revision [utf8] Fri Oct  9 14:13:41 2009
@@ -1,1 +1,1 @@
-45
+46