diff options
| author | fja-odoo <fja@odoo.com> | 2020-08-12 15:07:13 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2020-08-14 17:40:58 +0000 |
| commit | 704bcc552709f3b1e024f4a7aa83743f982fd5df (patch) | |
| tree | 52da8928ede4572cb0a37626d27f5a8685f5ce93 /addons/http_routing | |
| parent | 0b2f2b5d9632d49a384834885ef7d76b79320bd7 (diff) | |
[IMP] portal, *: move language switcher to portal
*: base, http_routing, website
Make the language switcher available on portal without website
installed.
Part of https://github.com/odoo/odoo/pull/55300
task-2203383
Co-authored-by: Jeremy Kersten <jke@odoo.com>
Co-authored-by: qsm-odoo <qsm@odoo.com>
Diffstat (limited to 'addons/http_routing')
| -rw-r--r-- | addons/http_routing/models/ir_http.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/addons/http_routing/models/ir_http.py b/addons/http_routing/models/ir_http.py index aa072912b31..6da75e3ef61 100644 --- a/addons/http_routing/models/ir_http.py +++ b/addons/http_routing/models/ir_http.py @@ -147,7 +147,7 @@ def url_lang(path_or_uri, lang_code=None): # relative URL with either a path or a force_lang if not url.netloc and not url.scheme and (url.path or force_lang): location = werkzeug.urls.url_join(request.httprequest.path, location) - lang_url_codes = [url_code for _, url_code, _ in Lang.get_available()] + lang_url_codes = [url_code for _, url_code, *_ in Lang.get_available()] lang_code = pycompat.to_text(lang_code or request.context['lang']) lang_url_code = Lang._lang_code_to_urlcode(lang_code) lang_url_code = lang_url_code if lang_url_code in lang_url_codes else lang_code @@ -208,7 +208,7 @@ def is_multilang_url(local_url, lang_url_codes=None): 2. If not matching 1., everything not under /static/ will be translatable ''' if not lang_url_codes: - lang_url_codes = [url_code for _, url_code, _ in request.env['res.lang'].get_available()] + lang_url_codes = [url_code for _, url_code, *_ in request.env['res.lang'].get_available()] spath = local_url.split('/') # if a language is already in the path, remove it if spath[1] in lang_url_codes: @@ -388,8 +388,7 @@ class IrHttp(models.AbstractModel): path = request.httprequest.path.split('/') is_a_bot = cls.is_a_bot() - available_langs = Lang.get_available() - lang_codes = [code for code, _, _ in available_langs] + lang_codes = [code for code, *_ in Lang.get_available()] nearest_lang = not func and cls.get_nearest_lang(Lang._lang_get_code(path[1])) cook_lang = request.httprequest.cookies.get('frontend_lang') cook_lang = cook_lang in lang_codes and cook_lang |