OpenERP Community Backports (Server)

Merge lp://staging/~numerigraphe-team/ocb-server/7.0-po-targets-933496-vmt into lp://staging/ocb-server

  1. 7.0-po-targets-933496-vmt
  2. Merge into 7.0
Proposed by Lionel Sausin - Initiatives/Numérigraphe
Status: Merged
Merged at revision: 5314
Proposed branch: lp://staging/~numerigraphe-team/ocb-server/7.0-po-targets-933496-vmt
Merge into: lp://staging/ocb-server
Diff against target: 379 lines (+270/-5)
10 files modified
openerp/tests/addons/test_translation_import/__init__.py (+2/-0)
openerp/tests/addons/test_translation_import/__openerp__.py (+15/-0)
openerp/tests/addons/test_translation_import/i18n/fr.po (+52/-0)
openerp/tests/addons/test_translation_import/i18n/test_translation_import.pot (+58/-0)
openerp/tests/addons/test_translation_import/models.py (+20/-0)
openerp/tests/addons/test_translation_import/tests.yml (+13/-0)
openerp/tests/addons/test_translation_import/tests/__init__.py (+9/-0)
openerp/tests/addons/test_translation_import/tests/test_term_count.py (+16/-0)
openerp/tests/addons/test_translation_import/view.xml (+23/-0)
openerp/tools/translate.py (+62/-5)
To merge this branch: bzr merge lp://staging/~numerigraphe-team/ocb-server/7.0-po-targets-933496-vmt
Reviewer Review Type Date Requested Status
Loïc Bellier - Numérigraphe (community) code review Approve
Pedro Manuel Baeza code review Approve
Holger Brunn (Therp) Needs Information
Review via email: mp+209895@code.staging.launchpad.net

Description of the change

This fixes a bug in translations that make them disappear when the string is removed from launchpad's current translation focus.
For example, when Launchpad's translation target becomes v8.0, all strings present in v7 but removed from v8 becomes untranslatable in v7.

This branch runs green on Runbot.
MP for stable 7.0 : https://code.launchpad.net/~numerigraphe-team/openobject-server/7.0-fix-po-targets-933496-vmt/+merge/215585

To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

I posted Vo Minh Thu's fix for 6.1 (https://code.launchpad.net/~therp-nl/ocb-server/6.1-lp933496/+merge/193011) but Pedro had an issue with I never managed to figure out. Pedro: Did you ever have a chance to dig into that? And do you have the same behavior with this patch and version 7.0?

review: Needs Information
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

I have checked at last the problem and see that the problem doesn't come from patch itself, but from pot files, so you can unlock both MPs.

I give also my approval to this.

review: Approve (code review)
Revision history for this message
Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives) wrote :

This branch currently runs red on runbot, and the original branch by VMT runs orange - missing access rules on demo data. I'll check what the problem is as soon as I can.

Revision history for this message
Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives) wrote :

Fixed, runs green on runbot again.

Revision history for this message
Loïc Bellier - Numérigraphe (lb-b) :
review: Approve (code review)
lp://staging/~numerigraphe-team/ocb-server/7.0-po-targets-933496-vmt updated
4799. By Numérigraphe

[DEL] remove VIM comments. Just because.

Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

I proceed with the merge because Holger's comment, refered to me, has been answered.

Regards.

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.

Subscribers

People subscribed via source and target branches

to status/vote changes: