From 174d7e8e49479d180c5b523d349275b774dfb5b6 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 22 May 2017 11:18:24 +0200 Subject: [PATCH] [FIX] website: The default language does not use the configuration The request language must be a fallback if the current website does not have a default language --- addons/website/models/ir_http.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index a1d19f016b4..946a0f823f3 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -179,8 +179,8 @@ class Http(models.AbstractModel): nearest_lang = not func and cls.get_nearest_lang(path[1]) url_lang = nearest_lang and path[1] preferred_lang = ((cook_lang if cook_lang in langs else False) - or (not is_a_bot and cls.get_nearest_lang(request.lang)) - or request.website.default_lang_code) + or request.website.default_lang_code + or (not is_a_bot and cls.get_nearest_lang(request.lang))) request.lang = context['lang'] = nearest_lang or preferred_lang # if lang in url but not the displayed or default language --> change or remove