diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-01-16 15:32:10 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-01-16 15:32:10 +0100 |
| commit | f05b2b120029da64679fc8dd9cd1f3f8b3c6abeb (patch) | |
| tree | 67a3c1ae1e1bee4c2b43a5fc16c711fed675a39b /addons/website/static/src | |
| parent | aa8a39fc4f2dab278a0cf42a58656527ce1efe19 (diff) | |
| parent | 5e474bb3f91650efd184f32c7f4f23e555aee3ec (diff) | |
[MERGE] forward port branch saas-15 up to 5e474bb3f91
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; }); |