Merge lp:~openerp-dev/openobject-server/6.0-opw-18482-atp into lp:openobject-server/6.0

[Atul Patel(OpenERP)]

Hello,

[Issue:18482]- Bad format of exported report translation
 I have fixed issue and Improve translations for webkit report sample using export po.

there is also bug in which step is mentioned. here is link:
https://bugs.launchpad.net/openobject-server/+bug/819334

kindly review it.

Thanks
Atul

[Lorenzo Battistini (elbati)]

Hello Atul,

according to my tests, this merge fixes bug 819334 .

Thanks

review: Approve

[Olivier Dony (Odoo) (odo-openerp)]

I might be wrong, but wouldn't a patch in report_webkit itself be much simpler and less riskier for stable?

For example this minimalist patch [1] makes webkit reports translations global to all webkit reports. This is pretty much what happens with terms that come from the code at the moment, and terms from mako templates are very similar to code. I think it would be sufficient and acceptable here.

[1] http://pastebin.com/KsFEFZyQ

review: Needs Information

[Rifakat Husen (OpenERP) (rha-openerp)]

@odo: I understand your concern here.
I applied your patch and it didn't work for me. Its calling translate_call() of report_webkit,
but while we do export of any po file from 'Export Translation', its calling server's act_getfile() of base.language.export

report_webkit does not come into picture in exporting po procedure.

Correct me if I am missing something.

Regards.

[Olivier Dony (Odoo) (odo-openerp)]

On 11/22/2011 07:38 AM, Rifakat (OpenERP) wrote:
> @odo: I understand your concern here.
> I applied your patch and it didn't work for me. Its calling translate_call() of report_webkit,
> but while we do export of any po file from 'Export Translation', its calling server's act_getfile() of base.language.export
>
> report_webkit does not come into picture in exporting po procedure.

Yes that seems like the expected behavior.
As far as I can see on the bug report, the problem is that
translate_call() does not consider the translated strings because it
uses a different name than what is exported in the PO files.

The bug report says:

"""
Due to the line
#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
translation couldn't correctly imported.
"""

This is the same export format as for strings that come from the code
with _(). And as I explained, I think the exported format is fine!
We decided to consider the mako templates of report_webkit just like
normal code, as they are also using something similar to _().
So there is no reason to change that, and it's fine to see
"report:addons/report_webkit_sample/report/report_webkit_html.mako" in
the exported PO!

The only thing to do is to make translate_call() behave like the _()
method we use in the code, and thus make it ignore the name of the
report, which cannot be matched properly, just like for string that cme
from code. This is what my one-line patch is trying to do.

> Correct me if I am missing something.

Have you tested the case of the bug report after applying my patch?
If it does not work, please explain what does not work:
- what entries do you have in ir.translation after importing a PO
containing webkit translations
- are the strings translated when you generate the report in the PO
language?
- if not, can you investigate why translate_call does not find them?

Keep in mind that we want to fix the fact that the translations are
ignored, *not* the format in which the translations are exported.

Thanks!

[Rifakat Husen (OpenERP) (rha-openerp)]

Hello Olivier,

Thanks for the clarification.

The problem I am facing is,

While calling the method _get_source() we pass name as None from translate_call(),
but always get name(mako path) in _get_source() rather than None.

Yes I have tested the case with our patch,
>- what entries do you have in ir.translation after importing a PO
>containing webkit translations
Lang: Italiano
name: addons/report_webkit_sample/report/report_webkit_html.mako
source: Supplier Invoice
value: Fattura Fornitore

>- are the strings translated when you generate the report in the PO
>language?
Yes, strings are translated.

Thanks for your help.

[Olivier Dony (Odoo) (odo-openerp)]

On 11/28/2011 01:38 PM, Rifakat (OpenERP) wrote:
> The problem I am facing is,
>
> While calling the method _get_source() we pass name as None from translate_call(),
> but always get name(mako path) in _get_source() rather than None.

Yes, and that's fine. We don't pass name=None because we expect to have
name=None in the ir.translation table, we pass name=None because we
don't know the name and don't care about matching it.
ir.translation._get_source will not try to match the name if we pass
None. This is just the same as what happens with strings that come from
Python code like _('foo').

> Yes I have tested the case with our patch,
>> - what entries do you have in ir.translation after importing a PO
>> containing webkit translations
> Lang: Italiano
> name: addons/report_webkit_sample/report/report_webkit_html.mako
> source: Supplier Invoice
> value: Fattura Fornitore

Looks correct.

>> - are the strings translated when you generate the report in the PO
>> language?
> Yes, strings are translated.

Then that patch is working fine from the beginning.
As I explained, all we care about is to be able to get translated
strings in final webkit reports, the rest of the bug report can be
ignored. So if it works, use it, we're done, no need to waste more time
on this.

[Olivier Dony (Odoo) (odo-openerp)]

Update: the proper one-line patch has landed on trunk addons at revision [1] and was backported to 6.0 at revision [2].
See the commit comment of revision [1] for more details if my comments on the current merge proposal are not clear enough.

[1] trunk addons rev.6365 revid: <email address hidden>
[2] 6.0 addons rev.5009 revid: <email address hidden>

review: Disapprove

Unmerged revisions

3536. By Atul Patel(OpenERP) on 2011-11-09

[FIX]translations: support webkit report translation.

=== modified file 'bin/tools/translate.py'
--- bin/tools/translate.py	2011-06-08 12:56:28 +0000
+++ bin/tools/translate.py	2011-11-09 10:14:13 +0000
@@ -42,6 +42,11 @@
 from tools.misc import UpdateableStr
 from tools.misc import SKIPPED_ELEMENT_TYPES
 
+join_dquotes = re.compile(r'([^\\])"[\s\\]*"', re.DOTALL)
+join_quotes = re.compile(r'([^\\])\'[\s\\]*\'', re.DOTALL)
+re_dquotes = re.compile(r'[^a-zA-Z0-9_]_\([\s]*"(.+?)"[\s]*?\)', re.DOTALL)
+re_quotes = re.compile(r'[^a-zA-Z0-9_]_\([\s]*\'(.+?)\'[\s]*?\)', re.DOTALL)
+
 _LOCALE2WIN32 = {
     'af_ZA': 'Afrikaans_South Africa',
     'sq_AL': 'Albanian_Albania',
@@ -316,6 +321,7 @@
             if not line.startswith('msgid'):
                 raise Exception("malformed file: bad line: %s" % line)
             source = unquote(line[6:])
+            
             line = self.lines.pop(0).strip()
             if not source and self.first:
                 # if the source is "" and it's the first msgid, it's the special
@@ -482,6 +488,16 @@
         res.extend(trans_parse_xsl(n))
     return res
 
+def trans_parse_webkit(de):
+    res = []
+    ite = re_dquotes.finditer(de)
+    for i in ite:
+        src = i.group(1)
+        src = join_dquotes.sub(r'\1', src)
+        src = src.decode('string_escape')
+        res.append(src)
+    return res
+
 def trans_parse_rml(de):
     res = []
     for n in de:
@@ -534,7 +550,6 @@
     uid = 1
     l = pool.obj_pool.items()
     l.sort()
-
     query = 'SELECT name, model, res_id, module'    \
             '  FROM ir_model_data'
 
@@ -554,7 +569,6 @@
     query_models += ' ORDER BY module, model'
 
     cr.execute(query, query_param)
-
     _to_translate = []
     def push_translation(module, type, name, id, source):
         tuple = (module, source, name, id, type)
@@ -669,12 +683,27 @@
             fname = ""
             if obj.report_rml:
                 fname = obj.report_rml
-                parse_func = trans_parse_rml
+                file, fileextension = os.path.splitext(fname)
+                if fileextension == '.mako':
+                    parse_func = trans_parse_webkit
+                    report_type = "report"
+                else:
+                    parse_func = trans_parse_rml                        
                 report_type = "report"
+                
             elif obj.report_xsl:
                 fname = obj.report_xsl
                 parse_func = trans_parse_xsl
                 report_type = "xsl"
+                
+            if obj.report_type == 'webkit':
+                report_file = tools.file_open(fname)
+                dt = report_file.read()
+                res = parse_func(dt)
+                name = 'report.%s' % name
+                for src in res:
+                    push_translation(module, report_type, name, 0, src)
+                        
             if fname and obj.report_type in ('pdf', 'xsl'):
                 try:
                     report_file = tools.file_open(fname)
@@ -697,15 +726,12 @@
                 push_translation(module, 'model', name, xml_name, encode(trad))
 
         # End of data for ir.model.data query results
-
     cr.execute(query_models, query_param)
-
     def push_constraint_msg(module, term_type, model, msg):
         # Check presence of __call__ directly instead of using
         # callable() because it will be deprecated as of Python 3.0
         if not hasattr(msg, '__call__'):
             push_translation(module, term_type, model, 0, encode(msg))
-
     for (model_id, model, module) in cr.fetchall():
         module = encode(module)
         model = encode(model)
@@ -760,11 +786,7 @@
     logger.debug("Scanning modules at paths: ", path_list)
 
     mod_paths = []
-    join_dquotes = re.compile(r'([^\\])"[\s\\]*"', re.DOTALL)
-    join_quotes = re.compile(r'([^\\])\'[\s\\]*\'', re.DOTALL)
-    re_dquotes = re.compile(r'[^a-zA-Z0-9_]_\([\s]*"(.+?)"[\s]*?\)', re.DOTALL)
-    re_quotes = re.compile(r'[^a-zA-Z0-9_]_\([\s]*\'(.+?)\'[\s]*?\)', re.DOTALL)
-
+    
     def export_code_terms_from_file(fname, path, root, terms_type):
         fabsolutepath = join(root, fname)
         frelativepath = fabsolutepath[len(path):]
@@ -819,8 +841,6 @@
         for root, dummy, files in tools.osutil.walksymlinks(path):
             for fname in itertools.chain(fnmatch.filter(files, '*.py')):
                 export_code_terms_from_file(fname, path, root, 'code')
-            for fname in itertools.chain(fnmatch.filter(files, '*.mako')):
-                export_code_terms_from_file(fname, path, root, 'report')
 
 
     out = [["module","type","name","res_id","src","value"]] # header
@@ -829,7 +849,6 @@
     for module, source, name, id, type in _to_translate:
         trans = trans_obj._get_source(cr, uid, name, type, lang, source)
         out.append([module, type, name, id, source, encode(trans) or ''])
-
     return out
 
 def trans_load(cr, filename, lang, verbose=True, context=None):