From 67aa9fa31a7c64bf59a1b942ecbe6dc83c878241 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 11 Jul 2012 12:44:05 +0530
Subject: [PATCH 01/14] [IMP] load translation using 'translation' http service

bzr revid: tpa@tinyerp.com-20120711071405-g0biuqlctedlbcs9
---
 addons/web/controllers/main.py | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 412ea9abda2..5d7aa93f3a5 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -353,25 +353,15 @@ class WebClient(openerpweb.Controller):
         langs = lang.split(separator)
         langs = [separator.join(langs[:x]) for x in range(1, len(langs) + 1)]
 
-        transs = {}
-        for addon_name in mods:
-            transl = {"messages":[]}
-            transs[addon_name] = transl
-            addons_path = openerpweb.addons_manifest[addon_name]['addons_path']
-            for l in langs:
-                f_name = os.path.join(addons_path, addon_name, "i18n", l + ".po")
-                if not os.path.exists(f_name):
-                    continue
-                try:
-                    with open(f_name) as t_file:
-                        po = babel.messages.pofile.read_po(t_file)
-                except Exception:
-                    continue
-                for x in po:
-                    if x.id and x.string and "openerp-web" in x.auto_comments:
-                        transl["messages"].append({'id': x.id, 'string': x.string})
-        return {"modules": transs,
-                "lang_parameters": lang_obj}
+        messages = {}
+        for mod in mods:
+            messages[mod] = {"messages":[]}
+            proxy = req.session.proxy("translation")
+            trans = proxy.load(req.session._db, [mod], langs, "web")
+            if trans:
+                messages[mod] = trans
+        return {"modules": {'messages': messages},
+                "lang_parameters": lang_obj} 
 
     @openerpweb.jsonrequest
     def version_info(self, req):

From f0f4ba6d413ce89e016b26895f1e3fb62450d2ae Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 12 Jul 2012 16:11:10 +0530
Subject: [PATCH 02/14] [IMP] improved code.

bzr revid: tpa@tinyerp.com-20120712104110-wot1evq0affpx2tp
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 5d7aa93f3a5..eb60b178ad2 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -360,7 +360,7 @@ class WebClient(openerpweb.Controller):
             trans = proxy.load(req.session._db, [mod], langs, "web")
             if trans:
                 messages[mod] = trans
-        return {"modules": {'messages': messages},
+        return {"modules": messages,
                 "lang_parameters": lang_obj} 
 
     @openerpweb.jsonrequest

From 4bbbef1929fc41b9928690ac77112ec5aa3db452 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 12 Jul 2012 16:29:55 +0530
Subject: [PATCH 03/14] [IMP] improved code for load translation when run web
 without embedded mode.

bzr revid: tpa@tinyerp.com-20120712105955-szwm5vb49va6o4dp
---
 addons/web/controllers/main.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index eb60b178ad2..75feed44c69 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -360,6 +360,24 @@ class WebClient(openerpweb.Controller):
             trans = proxy.load(req.session._db, [mod], langs, "web")
             if trans:
                 messages[mod] = trans
+        #  keep loading from .po (Reason to run web without embedded mode)
+        if not messages['web']['messages']:
+            for addon_name in mods:
+                transl = {'messages':[]}
+                messages[addon_name] = transl
+                addons_path = openerpweb.addons_manifest[addon_name]['addons_path']
+                for l in langs:
+                    f_name = os.path.join(addons_path, addon_name, "i18n", l + ".po")
+                    if not os.path.exists(f_name):
+                        continue
+                    try:
+                        with open(f_name) as t_file:
+                            po = babel.messages.pofile.read_po(t_file)
+                    except Exception:
+                        continue
+                    for x in po:
+                        if x.id and x.string and "openerp-web" in x.auto_comments:
+                            transl["messages"].append({'id': x.id, 'string': x.string})
         return {"modules": messages,
                 "lang_parameters": lang_obj} 
 

From e9c78767dd87c003c6e93f679e531e34b90d04c7 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 12 Jul 2012 18:55:42 +0530
Subject: [PATCH 04/14] [IMP] improved code

bzr revid: tpa@tinyerp.com-20120712132542-c19ysod7jm5jmukc
---
 addons/web/controllers/main.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 75feed44c69..6c0e2e4dc9b 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -357,9 +357,7 @@ class WebClient(openerpweb.Controller):
         for mod in mods:
             messages[mod] = {"messages":[]}
             proxy = req.session.proxy("translation")
-            trans = proxy.load(req.session._db, [mod], langs, "web")
-            if trans:
-                messages[mod] = trans
+            messages[mod] = proxy.load(req.session._db, [mod], langs, "web")
         #  keep loading from .po (Reason to run web without embedded mode)
         if not messages['web']['messages']:
             for addon_name in mods:

From 0d4bd736e1bd8c8acb78f63e190111b1c72b05af Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 13 Jul 2012 12:30:48 +0530
Subject: [PATCH 05/14] [IMP] improved code to get formeted traslation from
 server.

bzr revid: tpa@tinyerp.com-20120713070048-7yxm3fcajemiingc
---
 addons/web/controllers/main.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 6c0e2e4dc9b..7cde4040e4f 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -353,11 +353,8 @@ class WebClient(openerpweb.Controller):
         langs = lang.split(separator)
         langs = [separator.join(langs[:x]) for x in range(1, len(langs) + 1)]
 
-        messages = {}
-        for mod in mods:
-            messages[mod] = {"messages":[]}
-            proxy = req.session.proxy("translation")
-            messages[mod] = proxy.load(req.session._db, [mod], langs, "web")
+        proxy = req.session.proxy("translation")
+        messages = proxy.load(req.session._db, mods, langs, "web")
         #  keep loading from .po (Reason to run web without embedded mode)
         if not messages['web']['messages']:
             for addon_name in mods:

From 58e20e9c8f0f40b93a0d4dd1ff68666d49311949 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 16 Jul 2012 11:30:56 +0530
Subject: [PATCH 06/14] [IMP] improved code to load data from po.

bzr revid: tpa@tinyerp.com-20120716060056-3az6awpd6gw39hii
---
 addons/web/controllers/main.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 7cde4040e4f..024360ce5e6 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -355,14 +355,11 @@ class WebClient(openerpweb.Controller):
 
         proxy = req.session.proxy("translation")
         messages = proxy.load(req.session._db, mods, langs, "web")
-        #  keep loading from .po (Reason to run web without embedded mode)
-        if not messages['web']['messages']:
-            for addon_name in mods:
-                transl = {'messages':[]}
-                messages[addon_name] = transl
-                addons_path = openerpweb.addons_manifest[addon_name]['addons_path']
+        for mod in messages:
+            if not messages[mod]['messages']:
+                addons_path = openerpweb.addons_manifest[mod]['addons_path']
                 for l in langs:
-                    f_name = os.path.join(addons_path, addon_name, "i18n", l + ".po")
+                    f_name = os.path.join(addons_path, mod, "i18n", l + ".po")
                     if not os.path.exists(f_name):
                         continue
                     try:
@@ -372,7 +369,7 @@ class WebClient(openerpweb.Controller):
                         continue
                     for x in po:
                         if x.id and x.string and "openerp-web" in x.auto_comments:
-                            transl["messages"].append({'id': x.id, 'string': x.string})
+                            messages[mod]["messages"].append({'id': x.id, 'string': x.string})
         return {"modules": messages,
                 "lang_parameters": lang_obj} 
 

From a3a2ec416b3fb4be2dbf6ed0333b3d1417ddc206 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 18 Sep 2012 09:28:02 +0200
Subject: [PATCH 07/14] [IMP] translation: load translations from
 ir.translation after authenticating, use local POs for bootstrap only (login
 page)

bzr revid: odo@openerp.com-20120918072802-568n19bg1ecm1m2t
---
 addons/web/controllers/main.py        | 161 ++++++++++++++------------
 addons/web/static/src/js/coresetup.js |   7 +-
 addons/web/static/src/xml/base.xml    |   2 +-
 3 files changed, 93 insertions(+), 77 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index d420ba9175d..35698d1085d 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -19,7 +19,6 @@ import zlib
 from xml.etree import ElementTree
 from cStringIO import StringIO
 
-import babel.messages.pofile
 import werkzeug.utils
 import werkzeug.wrappers
 try:
@@ -203,47 +202,8 @@ def module_installed(req):
     sorted_modules = module_topological_sort(modules)
     return sorted_modules
 
-def module_installed_bypass_session(dbname):
-    loadable = openerpweb.addons_manifest.keys()
-    modules = {}
-    try:
-        import openerp.modules.registry
-        registry = openerp.modules.registry.RegistryManager.get(dbname)
-        with registry.cursor() as cr:
-            m = registry.get('ir.module.module')
-            # TODO The following code should move to ir.module.module.list_installed_modules()
-            domain = [('state','=','installed'), ('name','in', loadable)]
-            ids = m.search(cr, 1, [('state','=','installed'), ('name','in', loadable)])
-            for module in m.read(cr, 1, ids, ['name', 'dependencies_id']):
-                modules[module['name']] = []
-                deps = module.get('dependencies_id')
-                if deps:
-                    deps_read = registry.get('ir.module.module.dependency').read(cr, 1, deps, ['name'])
-                    dependencies = [i['name'] for i in deps_read]
-                    modules[module['name']] = dependencies
-    except Exception,e:
-        pass
-    sorted_modules = module_topological_sort(modules)
-    return sorted_modules
-
 def module_boot(req):
-    serverside = []
-    dbside = []
-    for i in req.config.server_wide_modules:
-        if i in openerpweb.addons_manifest:
-            serverside.append(i)
-    # if only one db load every module at boot
-    dbs = []
-    try:
-        dbs = db_list(req)
-    except xmlrpclib.Fault:
-        # ignore access denied
-        pass
-    if len(dbs) == 1:
-        dbside = module_installed_bypass_session(dbs[0])
-        dbside = [i for i in dbside if i not in serverside]
-    addons = serverside + dbside
-    return addons
+    return [m for m in req.config.server_wide_modules if m in openerpweb.addons_manifest]
 
 def concat_xml(file_list):
     """Concatenate xml files
@@ -531,6 +491,38 @@ def parse_context(context, session):
     except ValueError:
         return common.nonliterals.Context(session, context)
 
+
+# PO file parsing - only used to boostrap translations on the login page
+try:
+    # Use the faster PO parser from OpenERP server when available
+    from openerp.tools.translate import TinyPoFile
+    def _local_web_translations(trans_file):
+        messages = []
+        try:
+            with open(trans_file) as t_file:
+                po = TinyPoFile(t_file)
+                for _, _, _, source, value, comments in po:
+                    if "openerp-web" in comments:
+                        messages.append({'id': source, 'string': value})        
+        except Exception:
+            pass
+        return messages
+except ImportError:
+    # Otherwise fallback to Babel's slightly slower PO parser
+    import babel.messages.pofile
+    def _local_web_translations(trans_file):
+        messages = []
+        try:
+            with open(trans_file) as t_file:
+                po = babel.messages.pofile.read_po(t_file)
+        except Exception:
+            return
+        for x in po:
+            if x.id and x.string and "openerp-web" in x.auto_comments:
+                messages.append({'id': x.id, 'string': x.string})
+        return messages
+
+
 #----------------------------------------------------------
 # OpenERP Web web Controllers
 #----------------------------------------------------------
@@ -576,6 +568,7 @@ class Home(openerpweb.Controller):
     def login(self, req, db, login, key):
         return login_and_redirect(req, db, login, key)
 
+
 class WebClient(openerpweb.Controller):
     _cp_path = "/web/webclient"
 
@@ -658,41 +651,59 @@ class WebClient(openerpweb.Controller):
             last_modified, checksum)
 
     @openerpweb.jsonrequest
-    def translations(self, req, mods, lang):
-        lang_model = req.session.model('res.lang')
-        ids = lang_model.search([("code", "=", lang)])
-        if ids:
-            lang_obj = lang_model.read(ids[0], ["direction", "date_format", "time_format",
-                                                "grouping", "decimal_point", "thousands_sep"])
-        else:
-            lang_obj = None
+    def bootstrap_translations(self, req, mods):
+        """ Load local translations from *.po files, as a temporary solution
+            until we have established a valid session. This is meant only
+            for translating the login page and db management chrome, using
+            the browser's language. """
+        lang = req.httprequest.accept_languages.best or 'en'
+        # For performance reasons we only load a single translation, so for
+        # sub-languages (that should only be partially translated) we load the
+        # main language PO instead - that should be enough for the login screen.
+        if '-' in lang: # RFC2616 uses '-' separators for sublanguages
+            lang = [lang.split('-',1)[0], lang]
 
-        if "_" in lang:
-            separator = "_"
-        else:
-            separator = "@"
-        langs = lang.split(separator)
-        langs = [separator.join(langs[:x]) for x in range(1, len(langs) + 1)]
-
-        proxy = req.session.proxy("translation")
-        messages = proxy.load(req.session._db, mods, langs, "web")
+        translations_per_module = {}
         for addon_name in mods:
-            if not messages[addon_name]['messages']:
-                addons_path = openerpweb.addons_manifest[addon_name]['addons_path']
-                for l in langs:
-                    f_name = os.path.join(addons_path, addon_name, "i18n", l + ".po")
-                    if not os.path.exists(f_name):
-                        continue
-                    try:
-                        with open(f_name) as t_file:
-                            po = babel.messages.pofile.read_po(t_file)
-                    except Exception:
-                        continue
-                    for x in po:
-                        if x.id and x.string and "openerp-web" in x.auto_comments:
-                            messages[addon_name]["messages"].append({'id': x.id, 'string': x.string})
-        return {"modules": messages,
-                "lang_parameters": lang_obj} 
+            addons_path = openerpweb.addons_manifest[addon_name]['addons_path']
+            f_name = os.path.join(addons_path, addon_name, "i18n", lang + ".po")
+            if not os.path.exists(f_name):
+                continue
+            translations_per_module[addon_name] = {'messages': _local_web_translations(f_name)}
+            
+        return {"modules": translations_per_module,
+                "lang_parameters": None}
+
+    @openerpweb.jsonrequest
+    def translations(self, req, mods, lang):
+        res_lang = req.session.model('res.lang')
+        ids = res_lang.search([("code", "=", lang)])
+        lang_params = None
+        if ids:
+            lang_params = res_lang.read(ids[0], ["direction", "date_format", "time_format",
+                                                "grouping", "decimal_point", "thousands_sep"])
+
+        # Regional languages (ll_CC) must inherit/override their parent lang (ll), but this is
+        # done server-side when the language is loaded, so we only need to load the user's lang.
+        start = datetime.datetime.now()
+        ir_translation = req.session.model('ir.translation')
+        translations_per_module = {}
+        messages = ir_translation.search_read([('module','in',mods),('lang','=',lang),
+                                               ('comments','like','openerp-web'),('value','!=',False),
+                                               ('value','!=','')],
+                                              ['module','src','value','lang'], order='module') 
+        for mod, msg_group in itertools.groupby(messages, key=operator.itemgetter('module')):
+            translations_per_module.setdefault(mod,{'messages':[]})
+            translations_per_module[mod]['messages'].extend({'id': m['src'],
+                                                             'string': m['value']} \
+                                                                for m in msg_group)
+
+        print "Loaded translations in ", datetime.datetime.now()-start
+        import pprint
+        pprint.pprint(translations_per_module)
+
+        return {"modules": translations_per_module,
+                "lang_parameters": lang_params}
 
     @openerpweb.jsonrequest
     def version_info(self, req):
@@ -769,7 +780,7 @@ class Database(openerpweb.Controller):
                {'fileToken': int(token)}
             )
         except xmlrpclib.Fault, e:
-             return simplejson.dumps([[],[{'error': e.faultCode, 'title': 'backup Database'}]])
+            return simplejson.dumps([[],[{'error': e.faultCode, 'title': 'backup Database'}]])
 
     @openerpweb.httprequest
     def restore(self, req, db_file, restore_pwd, new_db):
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">

From 13dfee0de0fdca7edfc0eae157ebcb8904a6a8df Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 18 Sep 2012 15:51:11 +0200
Subject: [PATCH 08/14] [IMP] translations: keep only one method for loading
 translations

bzr revid: odo@openerp.com-20120918135111-o6ylzs1n36kqkh4c
---
 addons/web/controllers/main.py | 41 ++++++++++------------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 35698d1085d..234d765d5c7 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -19,6 +19,7 @@ import zlib
 from xml.etree import ElementTree
 from cStringIO import StringIO
 
+import babel.messages.pofile
 import werkzeug.utils
 import werkzeug.wrappers
 try:
@@ -492,35 +493,17 @@ def parse_context(context, session):
         return common.nonliterals.Context(session, context)
 
 
-# PO file parsing - only used to boostrap translations on the login page
-try:
-    # Use the faster PO parser from OpenERP server when available
-    from openerp.tools.translate import TinyPoFile
-    def _local_web_translations(trans_file):
-        messages = []
-        try:
-            with open(trans_file) as t_file:
-                po = TinyPoFile(t_file)
-                for _, _, _, source, value, comments in po:
-                    if "openerp-web" in comments:
-                        messages.append({'id': source, 'string': value})        
-        except Exception:
-            pass
-        return messages
-except ImportError:
-    # Otherwise fallback to Babel's slightly slower PO parser
-    import babel.messages.pofile
-    def _local_web_translations(trans_file):
-        messages = []
-        try:
-            with open(trans_file) as t_file:
-                po = babel.messages.pofile.read_po(t_file)
-        except Exception:
-            return
-        for x in po:
-            if x.id and x.string and "openerp-web" in x.auto_comments:
-                messages.append({'id': x.id, 'string': x.string})
-        return messages
+def _local_web_translations(trans_file):
+    messages = []
+    try:
+        with open(trans_file) as t_file:
+            po = babel.messages.pofile.read_po(t_file)
+    except Exception:
+        return
+    for x in po:
+        if x.id and x.string and "openerp-web" in x.auto_comments:
+            messages.append({'id': x.id, 'string': x.string})
+    return messages
 
 
 #----------------------------------------------------------

From f742d3b213e36df0e6b826fb3d0de610251db4fc Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 28 Sep 2012 23:00:07 +0200
Subject: [PATCH 09/14] [FIX] web: minor improvements to some translateable
 terms

bzr revid: odo@openerp.com-20120928210007-ukf4u20rpwmugfwt
---
 addons/web/static/src/js/coresetup.js | 3 +--
 addons/web/static/src/js/search.js    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 826275bfa0f..4a30a312b7a 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -605,8 +605,7 @@ var messages_by_seconds = function() {
         [120, _t("Don't leave yet,<br />it's still loading...")],
         [300, _t("You may not believe it,<br />but the application is actually loading...")],
         [420, _t("Take a minute to get a coffee,<br />because it's loading...")],
-        [600, _t("It's loading...<br />By the way, did you tried the kitten mode?")],
-        [3600, _t("Maybe you should consider pressing F5...")],
+        [3600, _t("Maybe you should consider reloading the application by pressing F5...")],
     ];
 };
 
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 8e9a31922b8..cd3611366e4 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1496,7 +1496,7 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
             if (value.length > 1) {
                 // more than one search_default m2o id? Should we OR them?
                 throw new Error(
-                    _("M2O search fields do not currently handle multiple default values"));
+                    _t("M2O search fields do not currently handle multiple default values"));
             }
             // there are many cases of {search_default_$m2ofield: [id]}, need
             // to handle this as if it were a single value.
@@ -1581,7 +1581,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
 
         $filter.unbind('click').click(function () {
             self.view.query.reset([{
-                category: _("Custom Filter"),
+                category: _t("Custom Filter"),
                 icon: 'M',
                 field: {
                     get_context: function () { return filter.context; },

From 42ae23d0323ff1377d5e6a3dad490c871af5b810 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 2 Oct 2012 11:33:59 +0200
Subject: [PATCH 10/14] [FIX] base.xml: disable translation on CSS style
 element

bzr revid: odo@openerp.com-20121002093359-dxdd60auidfra3rj
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 58bc224918c..b035c2c8c14 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1119,7 +1119,7 @@
                     <td>
                         <t t-call="HiddenInputFile">
                             <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
-                            <t t-set="fileupload_style">width: 83px;</t>
+                            <t t-set="fileupload_style" t-translation="off">width: 83px;</t>
                             <button class="oe_button oe_field_button" type="button">
                                 <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
                                 <span>Select</span>

From 49956d869e5c360b936a0dc0e63e89ffe3b8ef6b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 3 Oct 2012 00:02:58 +0200
Subject: [PATCH 11/14] restore monodb mode, disabled until we split
 translation/code loading

bzr revid: al@openerp.com-20121002220258-51w0lm0cn12l74p5
---
 addons/web/controllers/main.py | 41 ++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 14b8d4391c2..5ef7f3013e8 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -203,8 +203,49 @@ def module_installed(req):
     sorted_modules = module_topological_sort(modules)
     return sorted_modules
 
+def module_installed_bypass_session(dbname):
+    loadable = openerpweb.addons_manifest.keys()
+    modules = {}
+    try:
+        import openerp.modules.registry
+        registry = openerp.modules.registry.RegistryManager.get(dbname)
+        with registry.cursor() as cr:
+            m = registry.get('ir.module.module')
+            # TODO The following code should move to ir.module.module.list_installed_modules()
+            domain = [('state','=','installed'), ('name','in', loadable)]
+            ids = m.search(cr, 1, [('state','=','installed'), ('name','in', loadable)])
+            for module in m.read(cr, 1, ids, ['name', 'dependencies_id']):
+                modules[module['name']] = []
+                deps = module.get('dependencies_id')
+                if deps:
+                    deps_read = registry.get('ir.module.module.dependency').read(cr, 1, deps, ['name'])
+                    dependencies = [i['name'] for i in deps_read]
+                    modules[module['name']] = dependencies
+    except Exception,e:
+        pass
+    sorted_modules = module_topological_sort(modules)
+    return sorted_modules
+
 def module_boot(req):
     return [m for m in req.config.server_wide_modules if m in openerpweb.addons_manifest]
+    # TODO the following will be enabled once we separate the module code and translation loading
+    serverside = []
+    dbside = []
+    for i in req.config.server_wide_modules:
+        if i in openerpweb.addons_manifest:
+            serverside.append(i)
+    # if only one db load every module at boot
+    dbs = []
+    try:
+        dbs = db_list(req)
+    except xmlrpclib.Fault:
+        # ignore access denied
+        pass
+    if len(dbs) == 1:
+        dbside = module_installed_bypass_session(dbs[0])
+        dbside = [i for i in dbside if i not in serverside]
+    addons = serverside + dbside
+    return addons
 
 def concat_xml(file_list):
     """Concatenate xml files

From a606742693d9c7ef81b7dab0b815853b18d38ce7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 3 Oct 2012 15:12:38 +0200
Subject: [PATCH 12/14] [REM] Remove scripts for extracting web translations.
 The addons extractor now manages JS/qweb translations as well

bzr revid: odo@openerp.com-20121003131238-a94aye8jl3y17e3g
---
 babel.cfg           |   6 --
 gen_translations.sh |  66 ---------------------
 npybabel.py         | 140 --------------------------------------------
 3 files changed, 212 deletions(-)
 delete mode 100644 babel.cfg
 delete mode 100755 gen_translations.sh
 delete mode 100755 npybabel.py

diff --git a/babel.cfg b/babel.cfg
deleted file mode 100644
index 2e4913e8683..00000000000
--- a/babel.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[extractors]
-qweb = npybabel:extract_qweb
-javascript = npybabel:extract_javascript
-[javascript: static/src/js/**.js]
-[qweb: static/src/xml/**.xml]
-
diff --git a/gen_translations.sh b/gen_translations.sh
deleted file mode 100755
index 511dedc9084..00000000000
--- a/gen_translations.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-usage() {
-cat << EOF
-usage: $0 -a [DIR]
-usage: $0 <ADDON_DIR> <OUTPUT_FILE>
-
-OPTIONS:
-   -a [DIR]  export the .pot files for all web addons found
-             at target path (default: ./addons) 
-   -h        print this message
-EOF
-exit 0
-}
-
-do_all=
-
-while getopts "a" opt
-do
-    case "$opt" in
-    a) 
-        do_all=true;;
-    h)
-        usage;;
-    \?)
-        usage;;  
-  esac
-done
-
-shift $((OPTIND-1))
-
-if [ -n "$do_all" ]
-then
-    if [ "x$(which msgcat)" = "x" ]
-    then
-        echo "The msgcat command from the gettext tools is required in the PATH."
-        echo "On a Debian/Ubuntu system you may install gettext via 'sudo apt-get install gettext'"
-        exit 1
-    fi
-
-    echo "Extracting all web addons translations"
-    executable=$0
-    target_dir=${1:-./addons}
-    echo "Using target dir: ${target_dir}"
-    for mod in $(find ${target_dir} -type d -name 'static' -exec sh -c 'basename $(dirname {})' \;); do
-       echo ${mod}
-       mod_pot=${target_dir}/${mod}/i18n/${mod}.pot
-       web_pot=${mod_pot}.web
-       mkdir -p $(dirname ${web_pot})
-       $executable ${target_dir}/${mod} ${web_pot} 
-       if [ -f "${mod_pot}" ]; then
-         echo "Merging with existing PO file: ${mod_pot}"
-         msgcat --force-po -o "${mod_pot}.tmp" ${mod_pot} ${web_pot}
-         mv ${mod_pot}.tmp ${mod_pot}
-         rm ${web_pot}
-       else
-         echo "Renaming to final PO file: ${mod_pot}"
-         mv ${web_pot} ${mod_pot}
-       fi
-    done
-elif [ -n "$2" ]
-then
-    ./npybabel.py extract -F babel.cfg -o $2 -k _t -k _lt --no-default-keywords $1
-else
-    usage
-fi
diff --git a/npybabel.py b/npybabel.py
deleted file mode 100755
index 14ac115e338..00000000000
--- a/npybabel.py
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/env python
-# EASY-INSTALL-ENTRY-SCRIPT: 'Babel==0.9.6','console_scripts','pybabel'
-__requires__ = 'Babel==0.9.6'
-import sys
-from pkg_resources import load_entry_point
-import re
-import json
-from lxml import etree as elt
-from babel.messages import extract
-
-if __name__ == '__main__':
-    sys.exit(
-        load_entry_point('Babel==0.9.6', 'console_scripts', 'pybabel')()
-    )
-
-XMLJS_EXPR = re.compile(r"""(?:\_t *\( *((?:"(?:[^"\\]|\\.)*")|(?:'(?:[^'\\]|\\.)*')) *\))""")
-
-TRANSLATION_FLAG_COMMENT = "openerp-web"
-
-# List of etree._Element subclasses that we choose to ignore when parsing XML.
-# We include the *Base ones just in case, currently they seem to be subclasses of the _* ones.
-SKIPPED_ELEMENT_TYPES = (elt._Comment, elt._ProcessingInstruction, elt.CommentBase, elt.PIBase)
-
-def extract_xmljs(fileobj, keywords, comment_tags, options):
-    """Extract messages from Javascript code embedded into XML documents.
-    This complements the ``extract_javascript`` extractor which works
-    only on pure .js files, and the``extract_qweb`` extractor, which only
-    extracts XML text.
-
-    :param fileobj: the file-like object the messages should be extracted
-                    from
-    :param keywords: a list of keywords (i.e. function names) that should
-                     be recognized as translation functions
-    :param comment_tags: a list of translator tags to search for and
-                         include in the results
-    :param options: a dictionary of additional options (optional)
-    :return: an iterator over ``(lineno, funcname, message, comments)``
-             tuples
-    :rtype: ``iterator``
-    """
-    assert False, """ the XMLJS extractor does not work and was removed:
-
-    * Babel apparently does not accept two extractors for the same set of files
-      so it would not run the xmljs extractor at all, extraction of JS stuff
-      needs to be done from the XML extractor
-    * The regex above fails up if there are back-slashed quotes within the
-      translatable string (the string marked with _t), it just won't match the
-      string
-    * While extraction succeeds on XML entities (e.g. &quot;), translation
-      matching will fail if those entities are kept in the PO msgid as the
-      XML parser will get an un-escaped string, without those entities (so a
-      text extractor will extract ``Found match &quot;%s&quot;``, but the msgid
-      of the PO file must be ``Found match "%s"`` or the translation will fail
-    * single-quoted strings are not valid JSON string, so single-quoted strings
-      matched by the regex (likely since XML attributes are double-quoted,
-      single quotes within them don't have to be escaped) will blow up when
-      json-parsed for their content
-
-    I think that's about it.
-
-    If this extractor is reimplemented, it should be integrated into
-    extract_qweb, either in the current pass (probably not a good idea) or as
-    a separate pass using iterparse, matching either elements with t-js or
-    some other kinds of t-* directives (@t-esc, @t-raw, @t-att, others?),
-    shove the attribute content into a StringIO and pass *that* to Babel's
-    own extract_javascript; then add a line offset in order to yield the
-    correct line number.
-    """
-    content = fileobj.read()
-    found = XMLJS_EXPR.finditer(content)
-    index = 0
-    line_nbr = 0
-    for f in found:
-        msg = f.group(1)
-        msg = json.loads(msg)
-        while index < f.start():
-            if content[index] == "\n":
-                line_nbr += 1
-            index += 1
-        yield (line_nbr, None, msg, [TRANSLATION_FLAG_COMMENT])
-
-def extract_qweb(fileobj, keywords, comment_tags, options):
-    """Extract messages from qweb template files.
-    :param fileobj: the file-like object the messages should be extracted
-                    from
-    :param keywords: a list of keywords (i.e. function names) that should
-                     be recognized as translation functions
-    :param comment_tags: a list of translator tags to search for and
-                         include in the results
-    :param options: a dictionary of additional options (optional)
-    :return: an iterator over ``(lineno, funcname, message, comments)``
-             tuples
-    :rtype: ``iterator``
-    """
-    result = []
-    def handle_text(text, lineno):
-        text = (text or "").strip()
-        if len(text) > 1: # Avoid mono-char tokens like ':' ',' etc.
-            result.append((lineno, None, text, [TRANSLATION_FLAG_COMMENT]))
-
-    # not using elementTree.iterparse because we need to skip sub-trees in case
-    # the ancestor element had a reason to be skipped
-    def iter_elements(current_element):
-        for el in current_element:
-            if isinstance(el, SKIPPED_ELEMENT_TYPES): continue
-            if "t-js" not in el.attrib and \
-                    not ("t-jquery" in el.attrib and "t-operation" not in el.attrib) and \
-                    not ("t-translation" in el.attrib and el.attrib["t-translation"].strip() == "off"):
-                handle_text(el.text, el.sourceline)
-                for att in ('title', 'alt', 'label', 'placeholder'):
-                    if att in el.attrib:
-                        handle_text(el.attrib[att], el.sourceline)
-                iter_elements(el)
-            handle_text(el.tail, el.sourceline)
-
-    tree = elt.parse(fileobj)
-    iter_elements(tree.getroot())
-
-    return result
-
-def extract_javascript(fileobj, keywords, comment_tags, options):
-    """Extract messages from Javascript source files. This extractor delegates
-    to babel's buit-in javascript extractor, but adds a special comment
-    used as a flag to identify web translations. 
-
-    :param fileobj: the file-like object the messages should be extracted
-                    from
-    :param keywords: a list of keywords (i.e. function names) that should
-                     be recognized as translation functions
-    :param comment_tags: a list of translator tags to search for and
-                         include in the results
-    :param options: a dictionary of additional options (optional)
-    :return: an iterator over ``(lineno, funcname, message, comments)``
-             tuples
-    :rtype: ``iterator``
-    """
-    for (message_lineno, funcname, messages, comments) in \
-        extract.extract_javascript(fileobj, keywords, comment_tags, options):
-        comments.append(TRANSLATION_FLAG_COMMENT)
-        yield (message_lineno, funcname, messages, comments)

From a09b2fdff1586b7cc51053eabc5b3b9f6cc9a8bc Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 3 Oct 2012 17:21:21 +0200
Subject: [PATCH 13/14] [REM] cleanup leftover debug logging

bzr revid: odo@openerp.com-20121003152121-yeg4vhph4cy7xgpp
---
 addons/web/controllers/main.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 7e7282eb231..356e2960346 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -709,7 +709,6 @@ class WebClient(openerpweb.Controller):
 
         # Regional languages (ll_CC) must inherit/override their parent lang (ll), but this is
         # done server-side when the language is loaded, so we only need to load the user's lang.
-        start = datetime.datetime.now()
         ir_translation = req.session.model('ir.translation')
         translations_per_module = {}
         messages = ir_translation.search_read([('module','in',mods),('lang','=',lang),
@@ -721,11 +720,6 @@ class WebClient(openerpweb.Controller):
             translations_per_module[mod]['messages'].extend({'id': m['src'],
                                                              'string': m['value']} \
                                                                 for m in msg_group)
-
-        print "Loaded translations in ", datetime.datetime.now()-start
-        import pprint
-        pprint.pprint(translations_per_module)
-
         return {"modules": translations_per_module,
                 "lang_parameters": lang_params}
 

From 2514a564513918231a43785bfc48df753d16d700 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 3 Oct 2012 18:35:04 +0200
Subject: [PATCH 14/14] [FIX] coresetup: avoid losing whitespace after qweb
 translations

bzr revid: odo@openerp.com-20121003163504-64piei7sjv0b41wx
---
 addons/web/static/src/js/coresetup.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 4a30a312b7a..d55408ebc83 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -542,13 +542,9 @@ instance.web.qweb.preprocess_node = function() {
             if (translation && translation.value === 'off') {
                 return;
             }
-            var ts = _.str.trim(this.node.data);
-            if (ts.length === 0) {
-                return;
-            }
-            var tr = instance.web._t(ts);
-            if (tr !== ts) {
-                this.node.data = tr;
+            var match = /^(\s*)(.+?)(\s*)$/.exec(this.node.data);
+            if (match) {
+                this.node.data = match[1] + instance.web._t(match[2]) + match[3];
             }
             break;
         case 1: