From e32560e9ebb2733b115b112d1064ec9248f67b8a Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 29 Jan 2016 11:34:55 +0100
Subject: [PATCH] Update translation setup

Follow new infra setup for translations, see spec
http://specs.openstack.org/openstack-infra/infra-specs/specs/translation_setup.html
for full details.

This basically renames
oslo.messaging/locale/oslo.messaging.pot to
oslo_messaging/locale/oslo_messaging.pot. For this we need to update
setup.cfg.

Update also domain name in i18n.py.

Change-Id: Idf5300224f572d29953261ac998e7bf32a12822d
---
 oslo_messaging/_i18n.py                              |  2 +-
 .../en_GB/LC_MESSAGES/oslo_messaging-log-error.po    |  0
 .../en_GB/LC_MESSAGES/oslo_messaging-log-info.po     |  0
 .../en_GB/LC_MESSAGES/oslo_messaging-log-warning.po  |  0
 .../es/LC_MESSAGES/oslo_messaging-log-error.po       |  0
 .../locale/oslo_messaging-log-error.pot              |  0
 .../locale/oslo_messaging-log-info.pot               |  0
 .../locale/oslo_messaging-log-warning.pot            |  0
 .../locale/oslo_messaging.pot                        |  0
 setup.cfg                                            | 12 ++++++------
 10 files changed, 7 insertions(+), 7 deletions(-)
 rename oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-error.po => oslo_messaging/locale/en_GB/LC_MESSAGES/oslo_messaging-log-error.po (100%)
 rename oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-info.po => oslo_messaging/locale/en_GB/LC_MESSAGES/oslo_messaging-log-info.po (100%)
 rename oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-warning.po => oslo_messaging/locale/en_GB/LC_MESSAGES/oslo_messaging-log-warning.po (100%)
 rename oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-error.po => oslo_messaging/locale/es/LC_MESSAGES/oslo_messaging-log-error.po (100%)
 rename oslo.messaging/locale/oslo.messaging-log-error.pot => oslo_messaging/locale/oslo_messaging-log-error.pot (100%)
 rename oslo.messaging/locale/oslo.messaging-log-info.pot => oslo_messaging/locale/oslo_messaging-log-info.pot (100%)
 rename oslo.messaging/locale/oslo.messaging-log-warning.pot => oslo_messaging/locale/oslo_messaging-log-warning.pot (100%)
 rename oslo.messaging/locale/oslo.messaging.pot => oslo_messaging/locale/oslo_messaging.pot (100%)

diff --git a/oslo_messaging/_i18n.py b/oslo_messaging/_i18n.py
index a012b5866..cc3835c00 100644
--- a/oslo_messaging/_i18n.py
+++ b/oslo_messaging/_i18n.py
@@ -19,7 +19,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
 import oslo_i18n
 
 
-_translators = oslo_i18n.TranslatorFactory(domain='oslo.messaging')
+_translators = oslo_i18n.TranslatorFactory(domain='oslo_messaging')
 
 # The primary translation function using the well-known name "_"
 _ = _translators.primary
diff --git a/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-error.po b/oslo_messaging/locale/en_GB/LC_MESSAGES/oslo_messaging-log-error.po
similarity index 100%
rename from oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-error.po
rename to oslo_messaging/locale/en_GB/LC_MESSAGES/oslo_messaging-log-error.po
diff --git a/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-info.po b/oslo_messaging/locale/en_GB/LC_MESSAGES/oslo_messaging-log-info.po
similarity index 100%
rename from oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-info.po
rename to oslo_messaging/locale/en_GB/LC_MESSAGES/oslo_messaging-log-info.po
diff --git a/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-warning.po b/oslo_messaging/locale/en_GB/LC_MESSAGES/oslo_messaging-log-warning.po
similarity index 100%
rename from oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-warning.po
rename to oslo_messaging/locale/en_GB/LC_MESSAGES/oslo_messaging-log-warning.po
diff --git a/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-error.po b/oslo_messaging/locale/es/LC_MESSAGES/oslo_messaging-log-error.po
similarity index 100%
rename from oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-error.po
rename to oslo_messaging/locale/es/LC_MESSAGES/oslo_messaging-log-error.po
diff --git a/oslo.messaging/locale/oslo.messaging-log-error.pot b/oslo_messaging/locale/oslo_messaging-log-error.pot
similarity index 100%
rename from oslo.messaging/locale/oslo.messaging-log-error.pot
rename to oslo_messaging/locale/oslo_messaging-log-error.pot
diff --git a/oslo.messaging/locale/oslo.messaging-log-info.pot b/oslo_messaging/locale/oslo_messaging-log-info.pot
similarity index 100%
rename from oslo.messaging/locale/oslo.messaging-log-info.pot
rename to oslo_messaging/locale/oslo_messaging-log-info.pot
diff --git a/oslo.messaging/locale/oslo.messaging-log-warning.pot b/oslo_messaging/locale/oslo_messaging-log-warning.pot
similarity index 100%
rename from oslo.messaging/locale/oslo.messaging-log-warning.pot
rename to oslo_messaging/locale/oslo_messaging-log-warning.pot
diff --git a/oslo.messaging/locale/oslo.messaging.pot b/oslo_messaging/locale/oslo_messaging.pot
similarity index 100%
rename from oslo.messaging/locale/oslo.messaging.pot
rename to oslo_messaging/locale/oslo_messaging.pot
diff --git a/setup.cfg b/setup.cfg
index d09e6e685..99b42ad44 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -70,18 +70,18 @@ all_files = 1
 upload-dir = doc/build/html
 
 [compile_catalog]
-directory = oslo.messaging/locale
-domain = oslo.messaging
+directory = oslo_messaging/locale
+domain = oslo_messaging
 
 [update_catalog]
-domain = oslo.messaging
-output_dir = oslo.messaging/locale
-input_file = oslo.messaging/locale/oslo.messaging.pot
+domain = oslo_messaging
+output_dir = oslo_messaging/locale
+input_file = oslo_messaging/locale/oslo_messaging.pot
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = oslo.messaging/locale/oslo.messaging.pot
+output_file = oslo_messaging/locale/oslo_messaging.pot
 
 [pbr]
 warnerrors = true