[FIX] Do not display language choice if multilang=False
authorFabien Meghazi <fme@openerp.com>
Mon, 12 May 2014 15:42:01 +0000 (17:42 +0200)
committerFabien Meghazi <fme@openerp.com>
Mon, 12 May 2014 15:42:01 +0000 (17:42 +0200)
addons/website/models/ir_http.py
addons/website/views/website_templates.xml

index 358f105..b255091 100644 (file)
@@ -46,10 +46,12 @@ class ir_http(orm.AbstractModel):
         try:
             func, arguments = self._find_handler()
             request.website_enabled = func.routing.get('website', False)
+            request.website_multilang = func.routing.get('multilang', False)
         except werkzeug.exceptions.NotFound:
             # either we have a language prefixed route, either a real 404
             # in all cases, website processes them
             request.website_enabled = True
+            request.website_multilang = True
 
         if request.website_enabled:
             if func:
index 890d608..c34b5a9 100644 (file)
                 and main_object.website_meta_keywords or website_meta_keywords"/>
             <title><t t-esc="title"/></title>
 
-            <t t-set="languages" t-value="website.get_languages()"/>
-            <t t-foreach="languages" t-as="lg">
-                <t t-set="force_lang" t-value="lg[0] if lg[0] != website.default_lang_code else None"/>
-                <link rel="alternate" t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=force_lang)" t-att-hreflang="lg[0].replace('_', '-').lower()" />
+            <t t-if="request.website_multilang">
+                <t t-set="languages" t-value="website.get_languages()"/>
+                <t t-foreach="languages" t-as="lg">
+                    <t t-set="force_lang" t-value="lg[0] if lg[0] != website.default_lang_code else None"/>
+                    <link rel="alternate" t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=force_lang)" t-att-hreflang="lg[0].replace('_', '-').lower()" />
+                </t>
             </t>
 
             <t t-call-assets="website.assets_frontend"/>
                                         their performance.
                                     </p>
                                 </div>
-                                <ul class="list-inline js_language_selector mt16" t-if="(len(languages) &gt; 1 or editable)">
+                                <ul class="list-inline js_language_selector mt16" t-if="(request.website_multilang and len(languages) &gt; 1) or editable">
                                     <li t-foreach="languages" t-as="lg">
                                         <a t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
                                            t-att-data-default-lang="editable and 'true' if lg[0] == website.default_lang_code else None">