diff options
| author | Olivier Dony <odo@openerp.com> | 2012-09-18 09:28:02 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-09-18 09:28:02 +0200 |
| commit | a3a2ec416b3fb4be2dbf6ed0333b3d1417ddc206 (patch) | |
| tree | b43ed9558e8200d91cb05356f06c6775da7f82ec /addons/web/static/src | |
| parent | aef309a11c49a071815cf3dca1ef721251da41e6 (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')
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 7 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 2 |
2 files changed, 7 insertions, 2 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); + }) + ); }); }, /** diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index b6b89a4f1ec..d1d028aa3f5 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -407,7 +407,7 @@ <a class="oe_logo" href="#"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a> <div class="oe_secondary_menus_container"/> <div class="oe_footer"> - Powered by <a href="http://www.openerp.com" target="_blank"><span>Open</span>ERP</a> + Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a> </div> </td> <td class="oe_application"> |