diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-07-07 14:18:07 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-07-07 14:18:07 +0200 |
| commit | 0f2b2c4e2b99df8d68456016a4bea86e26c1c80e (patch) | |
| tree | 37ecc505ddb81ec1cd048dba9655e03e3176c546 /addons/web_editor/static/src/js | |
| parent | 5241d479b222bc11ebd1c0ff41c38872a3fea8fd (diff) | |
| parent | 514a1a76d81de3943f752ceaa5e487a2d25b9bb7 (diff) | |
[MERGE] forward port branch saas-15 up to 514a1a76d81
Diffstat (limited to 'addons/web_editor/static/src/js')
| -rw-r--r-- | addons/web_editor/static/src/js/base.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/base.js b/addons/web_editor/static/src/js/base.js index e4e2fcd6cad..4368f6de274 100644 --- a/addons/web_editor/static/src/js/base.js +++ b/addons/web_editor/static/src/js/base.js @@ -36,7 +36,7 @@ data.ready = function () { // TODO find a better way to find if we are in the backend or not // We don't load translation if we are in the backend since it's already done by the webclient if (!$(document).find('.o_web_client').length) { - load_translations(); + return load_translations(); } }); } else if(all_ready.state() === "resolved") { // can add async template |