Merge "Fix i18n translation imports"

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)

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
 
 

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
 
 

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 =