Merge lp:~numerigraphe/openobject-server/6.0-translations-lost-933496-odo into lp:openobject-server/6.0

[Numérigraphe]

This branch fixes an issue in translations, that makes translations unavailable in stable releases when the strings are removed from the trunk.
It is based on a patch by Olivier Dony, with an additional correction to actually fix the issue.
Lionel Sausin.

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

Thanks a lot for finishing my proof-of-concept patch, Lionel. The patch seems to work but after thinking about it more we think it might create really weird bugs, due to the way our translation entries are matched (name and/or source).
As you noticed, a simple change in the results ordering can give completely incomprehensible results to the user, and the same could happen when the matching translations are deleted for any reason -> the system would fallback to incorrect matches. Therefor it seems safer and more correct to use the comments that are in the PO templates, and which are not subject to alteration by Launchpad.
The patch Thu implemented in lp:~openerp-dev/openobject-server/6.1-fix-po-targets-933496-vmt is a little bit longer but should be completely low-risk. It also comes with a proper testcase (a test module for trunk - included in 6.1 for documentation purpose), have a look at it and feel free to ask for more cases to be covered if you don't feel confident with it. Backporting it to 6.0 should be simple enough if you really need to do so.

I hope you don't me closing your merge proposals to indicate that we prefer the safer solution. Sorry for having lead you towards an imperfect solution - it can still be used as a temporary fix.

[Numérigraphe (numerigraphe)]

Thanks Olivier,
That's fine. I've been following Thu's work and using your patch as a temporary fix indeed.

Unmerged revisions

3312. By Numerigraphe - Lionel Sausin <email address hidden> on 2012-10-11

[FIX] Correct previous patch by selecting only the best translation

3311. By Olivier Dony on 2012-10-11

[FIX] Mismatching PO comments cause translation issues: translations present in PO not visible in GUI

=== modified file 'bin/addons/base/ir/ir_translation.py'
--- bin/addons/base/ir/ir_translation.py	2011-01-07 15:17:35 +0000
+++ bin/addons/base/ir/ir_translation.py	2012-10-11 11:23:44 +0000
@@ -155,23 +155,25 @@
         if isinstance(types, basestring):
             types = (types,)
         if source:
-            query = """SELECT value 
+            query = """SELECT value,
+                              CASE WHEN type in %s THEN 1 ELSE 0 END as priority
                        FROM ir_translation 
                        WHERE lang=%s 
-                        AND type in %s 
                         AND src=%s"""
-            params = (lang or '', types, tools.ustr(source))
+            params = (types, lang or '', tools.ustr(source))
             if name:
                 query += " AND name=%s"
                 params += (tools.ustr(name),)
+            query += " ORDER BY priority DESC FETCH FIRST ROW ONLY"
             cr.execute(query, params)
         else:
-            cr.execute("""SELECT value
+            cr.execute("""SELECT value,
+                                 CASE WHEN type in %s THEN 1 ELSE 0 END as priority
                           FROM ir_translation
                           WHERE lang=%s
-                           AND type in %s
-                           AND name=%s""",
-                    (lang or '', types, tools.ustr(name)))
+                           AND name=%s
+                           ORDER BY priority DESC FETCH FIRST ROW ONLY""",
+                    (types, lang or '', tools.ustr(name)))
         res = cr.fetchone()
         trad = res and res[0] or u''
         if source and not trad: