diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml index 4e27ac8809a60f5d15f867f0b95b3f450336c8eb..a41c33170c0ca1f9e2a3f6cc42b4cbde560164fd 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml @@ -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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log index 1ce0aa1d11cfc1aa2b4676b2901eb2d69a4b0ba5..f4a133226ec7ed11e2098c0976e904ab2b4bfcf7 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log @@ -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. diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 72ded6f10dc5fb367986afc2ffeba2852198fb83..1b54fc946f391c91de691a712c97c423c84fc022 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -850 \ No newline at end of file +851 \ No newline at end of file