[MERGE] forward port branch 10.0 up to ef8cd11a6b

This commit is contained in:
Christophe Simonis
2018-01-16 13:55:47 +01:00
4 changed files with 25 additions and 16 deletions
+2 -1
View File
@@ -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;
});