Merge "Use oslo_i18n"

4 files changed, 37 insertions, 46 deletions

diff --git a/oslo_policy/_i18n.py b/oslo_policy/_i18n.py
new file mode 100644
index 0000000..e45e5a9
--- /dev/null
+++ b/oslo_policy/_i18n.py
@@ -0,0 +1,35 @@
+# 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.
+
+"""oslo.i18n integration module.
+
+See http://docs.openstack.org/developer/oslo.i18n/usage.html .
+
+"""
+
+import oslo_i18n
+
+
+_translators = oslo_i18n.TranslatorFactory(domain='oslo.policy')
+
+# The primary translation function using the well-known name "_"
+_ = _translators.primary
+
+# 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
diff --git a/oslo_policy/openstack/common/_i18n.py b/oslo_policy/openstack/common/_i18n.py
deleted file mode 100644
index 77c17dc..0000000
--- a/oslo_policy/openstack/common/_i18n.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#    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.
-
-"""oslo.i18n integration module.
-
-See http://docs.openstack.org/developer/oslo.i18n/usage.html
-
-"""
-
-try:
-    import oslo.i18n
-
-    # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
-    # application name when this module is synced into the separate
-    # repository. It is OK to have more than one translation function
-    # using the same domain, since there will still only be one message
-    # catalog.
-    _translators = oslo.i18n.TranslatorFactory(domain='oslo_policy')
-
-    # The primary translation function using the well-known name "_"
-    _ = _translators.primary
-
-    # 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
-except ImportError:
-    # NOTE(dims): Support for cases where a project wants to use
-    # code from oslo_policy-incubator, but is not ready to be internationalized
-    # (like tempest)
-    _ = _LI = _LW = _LE = _LC = lambda x: x
diff --git a/oslo_policy/policy.py b/oslo_policy/policy.py
index 5825488..1fecfe7 100644
--- a/oslo_policy/policy.py
+++ b/oslo_policy/policy.py
@@ -215,8 +215,8 @@ import six
 import six.moves.urllib.parse as urlparse
 import six.moves.urllib.request as urlrequest
 
+from oslo_policy._i18n import _, _LE, _LI
 from oslo_policy.openstack.common import fileutils
-from oslo_policy.openstack.common._i18n import _, _LE, _LI
 
 
 policy_opts = [
diff --git a/requirements.txt b/requirements.txt
index 49d2a1b..6cadd84 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,5 +4,6 @@
 
 oslo.concurrency>=1.4.1    # Apache-2.0
 oslo.config>=1.6.0         # Apache-2.0
+oslo.i18n>=1.3.0  # Apache-2.0
 oslo.log>=0.1.0            # Apache-2.0
 oslo.serialization>=1.2.0  # Apache-2.0