[imp] used the user language

bzr revid: nicolas.vanhoren@openerp.com-20110812154915-n7o666qfrc99aas8

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 08c1851..d4d4205 100644 (file)
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -272,10 +272,12 @@ class Session(openerpweb.Controller):
     @openerpweb.jsonrequest
     def login(self, req, db, login, password):
         req.session.login(db, login, password)
+        ctx = req.session.get_context()
 
         return {
             "session_id": req.session_id,
             "uid": req.session._uid,
+            "context": ctx
         }
 
     @openerpweb.jsonrequest

diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index f4c2961..c4609ba 100644 (file)
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -615,6 +615,7 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
         this.db = "";
         this.login = "";
         this.password = "";
+        this.user_context= {};
         this.uid = false;
         this.session_id = false;
         this.module_list = [];
@@ -741,6 +742,7 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
         this.rpc("/base/session/login", params, function(result) {
             self.session_id = result.session_id;
             self.uid = result.uid;
+            self.user_context = result.context;
             self.session_save();
             self.on_session_valid();
             if (success_callback)
@@ -758,6 +760,7 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
         this.session_id = this.get_cookie('session_id');
         this.db = this.get_cookie('db');
         this.login = this.get_cookie('login');
+        this.user_context = this.get_cookie("user_context");
         // we should do an rpc to confirm that this session_id is valid and if it is retrieve the information about db and login
         // then call on_session_valid
         this.on_session_valid();
@@ -770,6 +773,7 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
         this.set_cookie('session_id', this.session_id);
         this.set_cookie('db', this.db);
         this.set_cookie('login', this.login);
+        this.set_cookie('user_context', this.user_context);
     },
     logout: function() {
         delete this.uid;
@@ -822,7 +826,9 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
         var self = this;
         this.rpc('/base/session/modules', {}, function(result) {
             self.module_list = result;
-            self.rpc('/base/webclient/translations', {mods: ["base"].concat(result), lang: "fr"})
+            self.rpc('/base/webclient/translations',{
+                    mods: ["base"].concat(result),
+                    lang: self.user_context.lang})
                 .then(function(transs) {
                 openerp.base._t.database.set_bundle(transs);
                 var modules = self.module_list.join(',');