lp:~openerp-dev/openobject-server/6.1-fix-po-targets-933496-vmt
- Get this branch:
- bzr branch lp:~openerp-dev/openobject-server/6.1-fix-po-targets-933496-vmt
Branch merges
- Numérigraphe (community): Abstain (needs backport to 6.0)
- OpenERP Core Team: Pending requested
-
Diff: 386 lines (+276/-5)10 files modifiedopenerp/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)
Related bugs
Related blueprints
Branch information
Recent revisions
- 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. - 4287. By Olivier Dony (Odoo)
-
[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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openobject-server