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 /odoo | |
| 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 'odoo')
| -rw-r--r-- | odoo/addons/base/models/res_lang.py | 11 | ||||
| -rw-r--r-- | odoo/addons/base/wizard/base_language_install.py | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/odoo/addons/base/models/res_lang.py b/odoo/addons/base/models/res_lang.py index dcf901e1a22..f3f54eb3e96 100644 --- a/odoo/addons/base/models/res_lang.py +++ b/odoo/addons/base/models/res_lang.py @@ -209,9 +209,14 @@ class Lang(models.Model): @api.model @tools.ormcache() def get_available(self): - """ Return the available languages as a list of (code, name) sorted by name. """ + """ Return the available languages as a list of (code, url_code, name, + active) sorted by name. + """ langs = self.with_context(active_test=False).search([]) - return sorted([(lang.code, lang.url_code, lang.name) for lang in langs], key=itemgetter(2)) + return langs.get_sorted() + + def get_sorted(self): + return sorted([(lang.code, lang.url_code, lang.name, lang.active) for lang in self], key=itemgetter(2)) @tools.ormcache('self.id') def _get_cached_values(self): @@ -229,7 +234,7 @@ class Lang(models.Model): @api.model @tools.ormcache('code') def _lang_code_to_urlcode(self, code): - for c, urlc, name in self.get_available(): + for c, urlc, name, *_ in self.get_available(): if c == code: return urlc return self._lang_get(code).url_code diff --git a/odoo/addons/base/wizard/base_language_install.py b/odoo/addons/base/wizard/base_language_install.py index f9f495c56f8..0d4fd9bc233 100644 --- a/odoo/addons/base/wizard/base_language_install.py +++ b/odoo/addons/base/wizard/base_language_install.py @@ -20,7 +20,7 @@ class BaseLanguageInstall(models.TransientModel): @api.model def _get_languages(self): - return [[code, name] for code, _, name in self.env['res.lang'].get_available()] + return [[code, name] for code, _, name, *_ in self.env['res.lang'].get_available()] lang = fields.Selection(_get_languages, string='Language', required=True, default=_default_language) |
