From ab0be74f13aa57705bb106ee7bc1694ce73e0fe3 Mon Sep 17 00:00:00 2001
From: Reedip <reedip.banerjee@nectechnologies.in>
Date: Tue, 13 Sep 2016 09:23:47 +0530
Subject: [PATCH] Fix i18n translation imports

- Introduce _i18n for TaaS
- Change setup.cfg for the same changes

Closes-Bug: #1624214

Depends-On: Ie6b3811e41a94721679c9178cdd5119bdad8208d
Change-Id: I54ee8f87ae52f60fe20ed0b4292f61a2159d1db5
---
 neutron_taas/_i18n.py                  | 41 ++++++++++++++++++++++++++
 neutron_taas/taas_client/tapflow.py    |  2 +-
 neutron_taas/taas_client/tapservice.py |  2 +-
 setup.cfg                              |  8 ++---
 4 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 neutron_taas/_i18n.py

diff --git a/neutron_taas/_i18n.py b/neutron_taas/_i18n.py
new file mode 100644
index 00000000..5545e08a
--- /dev/null
+++ b/neutron_taas/_i18n.py
@@ -0,0 +1,41 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import oslo_i18n
+
+
+DOMAIN = 'neutron_taas'
+
+_translators = oslo_i18n.TranslatorFactory(domain=DOMAIN)
+
+# The primary translation function using the well-known name "_"
+_ = _translators.primary
+
+# The contextual translation function using the name "_C"
+_C = _translators.contextual_form
+
+# The plural translation function using the name "_P"
+_P = _translators.plural_form
+
+# Translators for log levels.
+#
+# The abbreviated names are meant to reflect the usual use of a short
+# name like '_'. The "L" is for "log" and the other letter comes from
+# the level.
+_LI = _translators.log_info
+_LW = _translators.log_warning
+_LE = _translators.log_error
+_LC = _translators.log_critical
+
+
+def get_available_languages():
+    return oslo_i18n.get_available_languages(DOMAIN)
diff --git a/neutron_taas/taas_client/tapflow.py b/neutron_taas/taas_client/tapflow.py
index e428427c..66b0338b 100644
--- a/neutron_taas/taas_client/tapflow.py
+++ b/neutron_taas/taas_client/tapflow.py
@@ -14,9 +14,9 @@
 #    under the License.
 #
 
+from neutron_taas._i18n import _
 from neutronclient.common import extension
 from neutronclient.common import utils
-from neutronclient.i18n import _
 from neutronclient.neutron import v2_0 as neutronv20
 
 
diff --git a/neutron_taas/taas_client/tapservice.py b/neutron_taas/taas_client/tapservice.py
index e95c4ad9..d173fbda 100644
--- a/neutron_taas/taas_client/tapservice.py
+++ b/neutron_taas/taas_client/tapservice.py
@@ -14,8 +14,8 @@
 #    under the License.
 #
 
+from neutron_taas._i18n import _
 from neutronclient.common import extension
-from neutronclient.i18n import _
 from neutronclient.neutron import v2_0 as neutronv20
 
 
diff --git a/setup.cfg b/setup.cfg
index a102a61c..27ffa663 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,17 +33,17 @@ upload-dir = doc/build/html
 
 [compile_catalog]
 directory = neutron_taas/locale
-domain = tap-as-a-service
+domain = neutron_taas
 
 [update_catalog]
-domain = tap-as-a-service
+domain = neutron_taas
 output_dir = neutron_taas/locale
-input_file = neutron_taas/locale/tap-as-a-service.pot
+input_file = neutron_taas/locale/neutron_taas.pot
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = neutron_taas/locale/tap-as-a-service.pot
+output_file = neutron_taas/locale/neutron_taas.pot
 
 [entry_points]
 console_scripts =