Merge lp://staging/~openerp-dev/openobject-server/6.1-fix-po-targets-933496-vmt into lp://staging/openobject-server/6.1
Proposed by
Vo Minh Thu
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~openerp-dev/openobject-server/6.1-fix-po-targets-933496-vmt |
| Merge into: | lp://staging/openobject-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/~openerp-dev/openobject-server/6.1-fix-po-targets-933496-vmt |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Numérigraphe (community) | needs backport to 6.0 | Abstain | |
| OpenERP Core Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Numérigraphe (numerigraphe) wrote | # |
review:
Abstain
(needs backport to 6.0)
Unmerged revisions
- 4292. By Vo Minh Thu
-
[FIX] tests: install the french translation during test_translatio
n_import. - 4291. By Vo Minh Thu
-
[TYPO]
- 4290. By Vo Minh Thu
-
[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.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
That looks OK at first glance, but I can only test a fix on v6.0.