summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/coresetup.js
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2012-09-18 09:28:02 +0200
committerOlivier Dony <odo@openerp.com>2012-09-18 09:28:02 +0200
commita3a2ec416b3fb4be2dbf6ed0333b3d1417ddc206 (patch)
treeb43ed9558e8200d91cb05356f06c6775da7f82ec /addons/web/static/src/js/coresetup.js
parentaef309a11c49a071815cf3dca1ef721251da41e6 (diff)
[IMP] translation: load translations from ir.translation after authenticating, use local POs for bootstrap only (login page)
bzr revid: odo@openerp.com-20120918072802-568n19bg1ecm1m2t
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
-rw-r--r--addons/web/static/src/js/coresetup.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index ea160d6faee..826275bfa0f 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -57,7 +57,12 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
if(self.session_is_valid()) {
return deferred.pipe(function() { return self.load_modules(); });
}
- return deferred;
+ return $.when(
+ deferred,
+ self.rpc('/web/webclient/bootstrap_translations', {mods: instance._modules}).pipe(function(trans) {
+ instance.web._t.database.set_bundle(trans);
+ })
+ );
});
},
/**