Let setup.py compile_catalog process all language files

Two years ago the translation files have been split into several
files, separating the log messages of different log levels from each
other, like X.pot, X-log-warning.pot, X-log-info.pot, and so on.
However, the setup.py command `compile_catalogs`, that comes from the
babel package and compiles the corresponding .po files into .mo
files, only supported one file per python package.  This means that
during packaging `compile_catalogs` never compiled the X-log-*.po
files, so the corresponding translations were always missing.

Since babel 2.3 the domain can be set to a space separated list of
domains.  This change adds the the additional log level files to the
domain list.

The obsolete check that .po and .pot files are valid is removed from
tox.ini.

Change-Id: I4d05c98b8ddd1a8416d7e0bc0298e86a0adc77d8
Closes-Bug: #1536226
This commit is contained in:
Sven Anderson 2016-05-20 16:23:55 +02:00
parent c9d036ff94
commit 1d8a6a9632
2 changed files with 1 additions and 3 deletions

View File

@ -161,7 +161,7 @@ setup-hooks =
[compile_catalog] [compile_catalog]
directory = heat/locale directory = heat/locale
domain = heat domain = heat heat-log-critical heat-log-error heat-log-warning
[update_catalog] [update_catalog]
domain = heat domain = heat

View File

@ -37,8 +37,6 @@ commands =
[testenv:pep8] [testenv:pep8]
commands = commands =
flake8 heat bin/heat-api bin/heat-api-cfn bin/heat-api-cloudwatch bin/heat-engine bin/heat-manage contrib heat_integrationtests doc/source flake8 heat bin/heat-api bin/heat-api-cfn bin/heat-api-cloudwatch bin/heat-engine bin/heat-manage contrib heat_integrationtests doc/source
# Check that .po and .pot files are valid:
bash -c "find heat -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
python tools/custom_guidelines.py --exclude heat/engine/resources/aws python tools/custom_guidelines.py --exclude heat/engine/resources/aws
[testenv:venv] [testenv:venv]