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

[nobody at svn.erp5.org]

Author: yo
Date: Wed Nov 18 16:25:29 2009
New Revision: 30738

URL: http://svn.erp5.org?rev=30738&view=rev
Log:
2009-11-19 yo
* Use preferred user interface languages to choose which languages should be displayed in the navigation box. If not defined, display all.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.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/navigation_box_render.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml?rev=30738&r1=30737&r2=30738&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml [utf8] Wed Nov 18 16:25:29 2009
@@ -42,7 +42,8 @@
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal"\n
            xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
-  <tal:block tal:define="actions python: here.getPortalObject().portal_actions.listFilteredActionsFor(here)">\n
+  <tal:block tal:define="portal here/getPortalObject;\n
+                         actions python:portal.portal_actions.listFilteredActionsFor(here)">\n
     <span class="first">\n
       <span id="favourites">\n
         <select name="select_favorite"\n
@@ -102,14 +103,18 @@
     <span class="second">\n
       <span id="language">\n
         <select name="select_language"\n
+                tal:define="language_list python:portal.portal_preferences.getPreference(\'preferred_user_interface_language_list\', None)"\n
                 onChange="submitAction(this.form,\'Base_doLanguage\')">\n
           <option value=""\n
                   i18n:translate="" i18n:domain="ui">My Language</option>\n
-          <option tal:repeat="language python: here.Localizer.get_languages_map()"\n
+          <tal:block tal:repeat="language python:portal.Localizer.get_languages_map()">\n
+          <option \n
+                  tal:condition="python:not language_list or language[\'id\'] in language_list"\n
                   tal:omit-tag="nothing"\n
                   tal:attributes="value language/id;\n
                   selected python: language[\'selected\'] and \'selected\' or nothing;"\n
                   tal:content="python: here.Localizer.erp5_ui.gettext(language[\'title\'], lang=language[\'id\'])" />\n
+          </tal:block>\n
         </select>\n
         <button type="submit" name="Base_doLanguage:method" title="Select Language"\n
                 i18n:attributes="title" i18n:domain="ui">\n

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=30738&r1=30737&r2=30738&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log [utf8] Wed Nov 18 16:25:29 2009
@@ -1,3 +1,6 @@
+2009-11-19 yo
+* Use preferred user interface languages to choose which languages should be displayed in the navigation box. If not defined, display all.
+
 2009-08-12 Jerome
 * add an onbeforeunload event to warn the user when he is about to leave the page without saving.
 

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=30738&r1=30737&r2=30738&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 Nov 18 16:25:29 2009
@@ -1,1 +1,1 @@
-850
+851