diff options
| author | Nicolas Lempereur <nle@odoo.com> | 2018-01-15 16:24:52 +0100 |
|---|---|---|
| committer | Nicolas Lempereur <nle@odoo.com> | 2018-01-15 16:31:19 +0100 |
| commit | ef8cd11a6be25cbb5288e8ab88b4aafa2fa0119c (patch) | |
| tree | 903b6a3ed4681b71e97949f4aca9fb4ce1293728 /addons/website/static/src/js | |
| parent | 5a83c9143ddb881e4459520ea6ce81f8c258442b (diff) | |
[FIX] website{,_slides}: display date in locale
In 10.0 since 52f268d0 some parts such as the date/datetime widget are
adapted to the current locale and not just displayed in english.
But the dates in the slides module are always in english because they
don't wait for the locale to be loaded.
To wait for the locale, this commit also adds a reference localeDef on
the website.website module.
note: this fix is only for [10.0,11.0[, another fix must be done in 11.0
opw-804555
closes #22241
Diffstat (limited to 'addons/website/static/src/js')
| -rw-r--r-- | addons/website/static/src/js/website.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 3c063ba60dc..d9d3943dcc1 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -241,7 +241,7 @@ odoo.define('website.website', function (require) { /* Load localizations */ var lang = utils.get_cookie('website_lang') || $('html').attr('lang') || 'en_US'; - ajax.loadJS('/web/webclient/locale/' + lang.replace('-', '_')); + var localeDef = ajax.loadJS('/web/webclient/locale/' + lang.replace('-', '_')); /** * Object who contains all method and bind for the top bar, the template is create server side. @@ -291,6 +291,7 @@ odoo.define('website.website', function (require) { console.warn("website.ready is deprecated: Please use require('web_editor.base').ready()"); return base.ready(); }, + localeDef: localeDef, }; return data; }); |