diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-01-16 13:55:47 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-01-16 13:55:47 +0100 |
| commit | 64dbc5fbb92f1921deffcbb857cdb57cdbed43cb (patch) | |
| tree | 0a26be5fea7077b48f49972f51f9aad26d51cb03 /addons/website/static/src | |
| parent | d35a76ee178102858417a80b781bbabdf6696df6 (diff) | |
| parent | ef8cd11a6be25cbb5288e8ab88b4aafa2fa0119c (diff) | |
[MERGE] forward port branch 10.0 up to ef8cd11a6be
Diffstat (limited to 'addons/website/static/src')
| -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; }); |