[MERGE] tools.translate: fix extraction of translation terms from mako source files...

bzr revid: odo@openerp.com-20130114112831-87gmdtqzaa55zssf

diff --cc openerp/tools/translate.py
index 405566e,e6d7047..41113b8
--- 1/openerp/tools/translate.py
--- 2/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@@ -886,8 -849,8 +886,9 @@@ def trans_generate(lang, modules, cr)
          for root, dummy, files in osutil.walksymlinks(path):
              for fname in fnmatch.filter(files, '*.py'):
                  babel_extract_terms(fname, path, root)
++            # mako provides a babel extractor: http://docs.makotemplates.org/en/latest/usage.html#babel
              for fname in fnmatch.filter(files, '*.mako'):
-                 babel_extract_terms(fname, path, root, trans_type='report')
+                 babel_extract_terms(fname, path, root, 'mako', trans_type='report')
              # Javascript source files in the static/src/js directory, rest is ignored (libs)
              if fnmatch.fnmatch(root, '*/static/src/js*'):
                  for fname in fnmatch.filter(files, '*.js'):