From 1d8a6a96329b87300dcf711912ab3b1c9f428cf3 Mon Sep 17 00:00:00 2001 From: Sven Anderson Date: Fri, 20 May 2016 16:23:55 +0200 Subject: [PATCH] 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 --- setup.cfg | 2 +- tox.ini | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 67c442c9d9..10b0c6a4f2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -161,7 +161,7 @@ setup-hooks = [compile_catalog] directory = heat/locale -domain = heat +domain = heat heat-log-critical heat-log-error heat-log-warning [update_catalog] domain = heat diff --git a/tox.ini b/tox.ini index 4e01b56e33..505fb55376 100644 --- a/tox.ini +++ b/tox.ini @@ -37,8 +37,6 @@ commands = [testenv:pep8] 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 - # 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 [testenv:venv]