lp:~openerp-dev/openobject-server/6.1-fix-po-targets-933496-vmt

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-server/6.1

Numérigraphe (community): Abstain (needs backport to 6.0) on 2012-10-23

OpenERP Core Team: Pending requested 2012-10-17

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #933496: Mismatching PO comments cause translation issues: translations present in PO not visible in GUI

Low

Fix Committed

Link a bug report

Related blueprints

4292. By Vo Minh Thu on 2012-10-30

[FIX] tests: install the french translation during test_translation_import.

4291. By Vo Minh Thu on 2012-10-17

[TYPO]

4290. By Vo Minh Thu on 2012-10-17

[FIX] tools.translate: when loading entries from a PO file, use also the POT.

On Launchpad, as commented on lp:933496, PO entries (andtheir comments) are
shared between series. This mean that e.g. the 6.1 series can have the wrong
`reference` comments (those beginning with #:) as they would be copied from say
the trunk series. Those `reference` comments are used by OpenERP to create its
translations and look them up.

This patch adds a few lines of code to tools.translate.py so that targets
defined in the POT `reference` comments are used in addition to those from the
PO file.

4289. By Launchpad Translations on behalf of openerp on 2012-10-11

Launchpad automatic translations update.

4288. By Launchpad Translations on behalf of openerp on 2012-10-10

Launchpad automatic translations update.

4287. By Olivier Dony (Odoo) on 2012-10-08

[MERGE] OPW 577045: translate: properly export and translate terms in XSL-based reports

This patch comes with a related patch on addons which
fixes a lot of cases of terms that were not properly
translated in reports, due to improper use of the
translation system. The addons patch also adds a
lot of missing entries in the POT files.

4286. By Launchpad Translations on behalf of openerp on 2012-10-08

Launchpad automatic translations update.

4285. By Launchpad Translations on behalf of openerp on 2012-10-05

Launchpad automatic translations update.

4284. By Launchpad Translations on behalf of openerp on 2012-10-03

Launchpad automatic translations update.

4283. By Launchpad Translations on behalf of openerp on 2012-10-02

Launchpad automatic translations update.