From 1d08697bc1a13e694f037f5d62116fff7abb0819 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi
Date: Mon, 12 May 2014 17:42:01 +0200
Subject: [PATCH] [FIX] Do not display language choice if multilang=False
---
addons/website/models/ir_http.py | 2 ++
addons/website/views/website_templates.xml | 12 +++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 358f105b0d0..b25509180b0 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -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:
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 890d6080039..c34b5a90ae0 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -83,10 +83,12 @@
and main_object.website_meta_keywords or website_meta_keywords"/>
-
-
-
-
+
+
+
+
+
+
@@ -177,7 +179,7 @@
their performance.
-