OpenERP Community Backports (Server)

Merge lp://staging/~therp-nl/ocb-server/6.1-lp933496 into lp://staging/ocb-server/6.1

6.1-lp933496
Merge into 6.1

Proposed by Holger Brunn (Therp) on 2013-10-29

Status:

Merged

Merged at revision:

4328

Proposed branch:

lp://staging/~therp-nl/ocb-server/6.1-lp933496

Merge into:

lp://staging/ocb-server/6.1

Diff against target:

386 lines (+276/-5)

10 files modified

openerp/tests/addons/test_translation_import/__init__.py (+3/-0)
openerp/tests/addons/test_translation_import/__openerp__.py (+16/-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 (+21/-0)
openerp/tests/addons/test_translation_import/tests.yml (+13/-0)
openerp/tests/addons/test_translation_import/tests/__init__.py (+10/-0)
openerp/tests/addons/test_translation_import/tests/test_term_count.py (+17/-0)
openerp/tests/addons/test_translation_import/view.xml (+23/-0)
openerp/tools/translate.py (+63/-5)

To merge this branch:

bzr merge lp://staging/~therp-nl/ocb-server/6.1-lp933496

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Lionel Sausin - Initiatives/Numérigraphe (community)			Approve on 2014-04-13
Pedro Manuel Baeza	code review and test	2013-10-29	Approve on 2014-03-19
Review via email: mp+193011@code.staging.launchpad.net

Description of the change

This is a backport of the fix for translation weirdnesses in 6.1. They are bound to become worse over time, so I think we really need this for 6.1. With 7.0, I didn't run into sort like problems yet, which is why I don't propose the same thing for 7.0.

Revision history for this message

Pedro Manuel Baeza (pedro.baeza) wrote on 2013-10-31:

Hi, Holger, thank you very much for the fix. I have tried it, but the issues I was experimenting are already there. You can see here an screenshot:

http://img27.imageshack.us/img27/5065/tem5.png

I'm not sure if the problem is the same, but the beginning of the problem start more or less at the same time of the 7.0 debut.

Sorry for not being more helpful, but I don't know very well translation engine and it's very difficult to me to trace the problem.

Regards.

Revision history for this message

Holger Brunn (Therp) (hbrunn) wrote on 2013-11-02:

Did you do an --update=all after applying the patch? It changes the way translations are loaded, so without the update, nothing happens.

Revision history for this message

Pedro Manuel Baeza (pedro.baeza) wrote on 2013-11-04:

Yeah, I did it also on a fresh DB, so maybe the problem is another. I will investigate further when I have a little time, but do you have any tip about what is happenning?

Regards.

Revision history for this message

Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives) wrote on 2014-03-07:

Has there been any progress on this issue?

review: Needs Information

Revision history for this message

Alberto Garcia (Factor Libre) (agarcia-flibre) wrote on 2014-03-19:

After merge there are termns isnt translated like menu purchases. I try with spanish

Revision history for this message

Pedro Manuel Baeza (pedro.baeza) wrote on 2014-03-19:

Digging deeply in the problem, I could test that the patch is working correctly. The problem comes from another place: pot files are not correct on official repository, so there's no valid translation source (neither .po nor .pot files). More info on the related bug report.

I give then my approval to this MP, but I'm going to notify the problem (maybe via another bug), and let Olivier know about it.

Regards.

review: Approve (code review and test)

Revision history for this message

Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives) wrote on 2014-04-13:

The patch can be further improved by using a TransientModel instead of a Model for testing. In v7.0 this fixes a warning about missing permissions. See http://bazaar.launchpad.net/~numerigraphe-team/ocb-server/7.0-po-targets-933496-vmt/revision/4798
I don't see any other problem than this detail, so I approve.

review: Approve

Revision history for this message

Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives) wrote on 2014-04-13:

Same patch proposed for lp:ocb-server/7.0: https://code.launchpad.net/~numerigraphe-team/ocb-server/7.0-po-targets-933496-vmt/+merge/209895

Revision history for this message

Pedro Manuel Baeza (pedro.baeza) wrote on 2014-04-18:

I proceed with the merge making the change that Lionel has proposed (change to orm.TransientModel). In the unlikely case that OpenERP merge the patch in the upstream, we will have a conflict, but it's very easy to resolve.

Regards.