[MERGE] trunk updates again, to get dates fixing

bzr revid: xmo@openerp.com-20110823075029-ahsdopldivaz0s60

1 files changed, 8 insertions, 2 deletions

diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index 68cc4d0869b..fca993ffef9 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -557,11 +557,17 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
             self.rpc('/base/webclient/translations',params).then(function(transs) {
                 openerp.base._t.database.set_bundle(transs);
                 var modules = self.module_list.join(',');
+                var file_list = ["/base/static/lib/datejs/globalization/" +
+                    self.user_context.lang.replace("_", "-") + ".js",
+
+                    ];
                 if(self.debug) {
                     self.rpc('/base/webclient/csslist', {"mods": modules}, self.do_load_css);
-                    self.rpc('/base/webclient/jslist', {"mods": modules}, self.do_load_js);
+                    self.rpc('/base/webclient/jslist', {"mods": modules}, function(files) {
+                        self.do_load_js(file_list.concat(files));
+                    });
                 } else {
-                    self.do_load_css(["/base/webclient/css?mods="+modules]);
+                    self.do_load_css(file_list.concat(["/base/webclient/css?mods="+modules]));
                     self.do_load_js(["/base/webclient/js?mods="+modules]);
                 }
                 openerp._modules_loaded = true;