diff options
| author | Nasreddin (bon) <bon@odoo.com> | 2021-01-06 16:17:24 +0000 |
|---|---|---|
| committer | Nasreddin (bon) <bon@odoo.com> | 2021-01-10 18:26:33 +0000 |
| commit | e6ccdb397792db62c3b08d96435b3c1667c1aa9d (patch) | |
| tree | cc5008841ba7b837172dd3dc099dc961d541c3f5 /addons/web_editor/models | |
| parent | 120366491f58a802deef68a17ebb26199ef829a2 (diff) | |
[FIX] misc: Babel; handle 'kur' (kurdish) locale
Issue
- add a new language with locale code KUR (for Kurdish)
- print any report with a datetime on it (RFQ for example)
Cause
Babel (version < 2.7.0) does not handle locale "KUR".
Solution
If wrong locale or not managed by Babel, try to fallback
on server default locale.
If still wrong locale or not managed, then fallback on "en_US" as locale.
opw-2416482
closes odoo/odoo#64301
X-original-commit: 0276c3ef20c79e7061ea5b92aafd6dea190c6a27
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
Signed-off-by: bon-odoo <nboulif@users.noreply.github.com>
Diffstat (limited to 'addons/web_editor/models')
| -rw-r--r-- | addons/web_editor/models/ir_qweb.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web_editor/models/ir_qweb.py b/addons/web_editor/models/ir_qweb.py index 7bd21dff430..0dc6db13315 100644 --- a/addons/web_editor/models/ir_qweb.py +++ b/addons/web_editor/models/ir_qweb.py @@ -32,7 +32,7 @@ import odoo.modules from odoo import api, models, fields from odoo.tools import ustr, posix_to_ldml, pycompat from odoo.tools import html_escape as escape -from odoo.tools.misc import get_lang +from odoo.tools.misc import get_lang, babel_locale_parse from odoo.addons.base.models import ir_qweb REMOTE_CONNECTION_TIMEOUT = 2.5 @@ -248,7 +248,7 @@ class Date(models.AbstractModel): return attrs lg = self.env['res.lang']._lang_get(self.env.user.lang) or get_lang(self.env) - locale = babel.Locale.parse(lg.code) + locale = babel_locale_parse(lg.code) babel_format = value_format = posix_to_ldml(lg.date_format, locale=locale) if record[field_name]: @@ -282,7 +282,7 @@ class DateTime(models.AbstractModel): value = record[field_name] lg = self.env['res.lang']._lang_get(self.env.user.lang) or get_lang(self.env) - locale = babel.Locale.parse(lg.code) + locale = babel_locale_parse(lg.code) babel_format = value_format = posix_to_ldml('%s %s' % (lg.date_format, lg.time_format), locale=locale) tz = record.env.context.get('tz') or self.env.user.tz |