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

Proposed by Numérigraphe
Status: Rejected
Rejected by: Olivier Dony (Odoo)
Proposed branch: lp://staging/~numerigraphe/openobject-server/6.0-translations-lost-933496-odo
Merge into: lp://staging/openobject-server/6.1
Diff against target: 36 lines (+9/-7)
1 file modified
openerp/addons/base/ir/ir_translation.py (+9/-7)
To merge this branch: bzr merge lp://staging/~numerigraphe/openobject-server/6.0-translations-lost-933496-odo
Reviewer Review Type Date Requested Status
Olivier Dony (Odoo) Pending
OpenERP Core Team Pending
Review via email: mp+129160@code.staging.launchpad.net

Description of the change

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.
The same fix for v6.0 is applicable to 6.1.
Lionel Sausin.

To post a comment you must log in.
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

Closing for the same reason as for the MP of lp:~numerigraphe/openobject-server/6.0-translations-lost-933496-odo

Unmerged revisions

3312. By Numerigraphe - Lionel Sausin <email address hidden>

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

3311. By Olivier Dony

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.