[Erp5-report] r41749 nicolas - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/e...

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Dec 24 13:30:49 2010
New Revision: 41749

URL: http://svn.erp5.org?rev=41749&view=rev
Log:
Do not try to display more languages than the one configured on WebSite level

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_minimal_theme/language_selector.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_minimal_theme/language_selector.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_minimal_theme/language_selector.xml?rev=41749&r1=41748&r2=41749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_minimal_theme/language_selector.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_minimal_theme/language_selector.xml [utf8] Fri Dec 24 13:30:49 2010
@@ -37,11 +37,12 @@
             <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block tal:define="language_list here/Localizer/get_languages_map;\n
+                       available_language_list here/getAvailableLanguageList;\n
                        absolute_url here/absolute_url">\n
-<tal:block tal:repeat="language language_list" tal:condition="python:len(language_list) > 1">\n
+<tal:block tal:repeat="language language_list" tal:condition="python:len(available_language_list) > 1">\n
 <b tal:condition="language/selected"><u tal:content="language/id"/></b>\n
 <a tal:attributes="href python:\'%s/Base_doLanguage?select_language=%s\' % (absolute_url, language[\'id\'])"\n
-   tal:content="language/id" tal:condition="not:language/selected"/>\n
+   tal:content="language/id" tal:condition="python: language[\'id\'] in available_language_list and not language.get(\'selected\')"/>\n
 </tal:block>\n
 </tal:block>
 

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=41749&r1=41748&r2=41749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Fri Dec 24 13:30:49 2010
@@ -1 +1 @@
-1011
\ No newline at end of file
+1014
\ No newline at end of file