Switchover to oslo.i18n package

Change-Id: I18d9a21b75053d382fb5bbebba226eda4c174f0c

contrib/ipaextractor.py

@@ -25,9 +25,9 @@ import requests
 from oslo.config import cfg
 
 from designate.backend import impl_ipa
-from designate.openstack.common.gettextutils import _LI
-from designate.openstack.common.gettextutils import _LW
-from designate.openstack.common.gettextutils import _LE
+from designate.i18n import _LI
+from designate.i18n import _LW
+from designate.i18n import _LE
 from designate import utils
 
 

contrib/zoneextractor.py

@@ -22,8 +22,8 @@ import logging
 
 import dns.zone
 
-from designate.openstack.common.gettextutils import _LI
-from designate.openstack.common.gettextutils import _LE
+from designate.i18n import _LI
+from designate.i18n import _LE
 
 
 logging.basicConfig()

designate/api/middleware.py

@@ -27,10 +27,10 @@ from designate.openstack.common import jsonutils as json
 from designate.openstack.common import log as logging
 from designate.openstack.common import strutils
 from designate.openstack.common.middleware import request_id
-from designate.openstack.common.gettextutils import _LI
-from designate.openstack.common.gettextutils import _LW
-from designate.openstack.common.gettextutils import _LE
-from designate.openstack.common.gettextutils import _LC
+from designate.i18n import _LI
+from designate.i18n import _LW
+from designate.i18n import _LE
+from designate.i18n import _LC
 
 
 LOG = logging.getLogger(__name__)

designate/api/service.py

@@ -17,7 +17,7 @@ from paste import deploy
 from oslo.config import cfg
 
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LI
+from designate.i18n import _LI
 from designate.openstack.deprecated import wsgi
 from designate import exceptions
 from designate import utils

designate/api/v2/controllers/rest.py

@@ -34,7 +34,7 @@ import pecan.routing
 from designate import exceptions
 from designate import api
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _
+from designate.i18n import _
 
 
 LOG = logging.getLogger(__name__)

designate/backend/base.py

@@ -16,7 +16,7 @@
 import abc
 
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LW
+from designate.i18n import _LW
 from designate import exceptions
 from designate.context import DesignateContext
 from designate.plugin import DriverPlugin

designate/backend/impl_bind9.py

@@ -20,7 +20,7 @@ import shutil
 from oslo.config import cfg
 
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LW
+from designate.i18n import _LW
 from designate import utils
 from designate.backend import base
 

designate/backend/impl_dynect.py

@@ -24,8 +24,8 @@ from requests.adapters import HTTPAdapter
 from designate import exceptions
 from designate.backend import base
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LI
-from designate.openstack.common.gettextutils import _LW
+from designate.i18n import _LI
+from designate.i18n import _LW
 
 
 LOG = logging.getLogger(__name__)

designate/backend/impl_fake.py

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LI
+from designate.i18n import _LI
 from designate.backend import base
 
 LOG = logging.getLogger(__name__)

designate/backend/impl_ipa/__init__.py

@@ -24,7 +24,7 @@ from designate.openstack.common import log as logging
 from designate.openstack.common import importutils
 from designate.backend import base
 from designate.openstack.common import jsonutils as json
-from designate.openstack.common.gettextutils import _LE
+from designate.i18n import _LE
 
 
 LOG = logging.getLogger(__name__)

designate/backend/impl_ipa/auth.py

@@ -21,8 +21,8 @@ from requests import auth
 import kerberos
 
 from designate.backend.impl_ipa import IPAAuthError
-from designate.openstack.common.gettextutils import _LW
-from designate.openstack.common.gettextutils import _LE
+from designate.i18n import _LW
+from designate.i18n import _LE
 
 
 LOG = logging.getLogger(__name__)

designate/backend/impl_powerdns/__init__.py

@@ -27,7 +27,7 @@ from sqlalchemy.orm import exc as sqlalchemy_exceptions
 
 from designate.openstack.common import excutils
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LC
+from designate.i18n import _LC
 from designate import exceptions
 from designate.backend import base
 from designate.backend.impl_powerdns import models

designate/backend/impl_powerdns/migrate_repo/versions/006_add_inherit_ttl_col.py

@@ -17,7 +17,7 @@
 from sqlalchemy import MetaData, Table, Column, Boolean
 
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LW
+from designate.i18n import _LW
 
 
 LOG = logging.getLogger(__name__)

designate/central/rpcapi.py

@@ -17,7 +17,7 @@ from oslo.config import cfg
 from oslo import messaging
 
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LI
+from designate.i18n import _LI
 from designate import rpc
 
 

designate/central/service.py

@@ -23,8 +23,8 @@ from oslo import messaging
 
 from designate.openstack.common import log as logging
 from designate.openstack.common import excutils
-from designate.openstack.common.gettextutils import _LI
-from designate.openstack.common.gettextutils import _LC
+from designate.i18n import _LI
+from designate.i18n import _LC
 from designate import backend
 from designate import central
 from designate import exceptions

designate/cmd/manage.py

@@ -23,12 +23,9 @@ from oslo.config import cfg
 from stevedore.extension import ExtensionManager
 
 from designate import utils
-from designate.openstack.common import gettextutils
-from designate.openstack.common.gettextutils import _
+from designate.i18n import _
 from designate.openstack.common import log as logging
 
-gettextutils.install('designate')
-
 eventlet.monkey_patch(os=False)
 
 

designate/i18n.py

@@ -0,0 +1,32 @@
+# Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+# Author: Kiall Mac Innes <kiall@hp.com>
+#
+# 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.
+from oslo import i18n
+
+
+_translators = i18n.TranslatorFactory(domain='designate')
+
+# 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

designate/manage/tlds.py

@@ -21,8 +21,8 @@ from designate import exceptions
 from designate import rpc
 from designate.central import rpcapi as central_rpcapi
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LI
-from designate.openstack.common.gettextutils import _LE
+from designate.i18n import _LI
+from designate.i18n import _LE
 from designate.manage import base
 from designate.schema import format
 

designate/mdns/handler.py

@@ -20,7 +20,7 @@ from designate import exceptions
 from designate import storage
 from designate.context import DesignateContext
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LE
+from designate.i18n import _LE
 
 
 LOG = logging.getLogger(__name__)

designate/mdns/notify.py

@@ -18,8 +18,8 @@ from oslo.config import cfg
 
 from designate import exceptions
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LI
-from designate.openstack.common.gettextutils import _LW
+from designate.i18n import _LI
+from designate.i18n import _LW
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

designate/mdns/rpcapi.py

@@ -16,7 +16,7 @@ from oslo.config import cfg
 from oslo import messaging
 
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LI
+from designate.i18n import _LI
 from designate import rpc
 
 

designate/mdns/service.py

@@ -22,9 +22,9 @@ from designate import service
 from designate.mdns import handler
 from designate.mdns import notify
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LE
-from designate.openstack.common.gettextutils import _LI
-from designate.openstack.common.gettextutils import _LW
+from designate.i18n import _LE
+from designate.i18n import _LI
+from designate.i18n import _LW
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

designate/network_api/neutron.py

@@ -24,8 +24,8 @@ from oslo.config import cfg
 from designate import exceptions
 from designate.openstack.common import log as logging
 from designate.openstack.common import threadgroup
-from designate.openstack.common.gettextutils import _LW
-from designate.openstack.common.gettextutils import _LE
+from designate.i18n import _LW
+from designate.i18n import _LE
 from designate.network_api.base import NetworkAPI
 
 

designate/openstack/deprecated/exception.py

@@ -21,7 +21,7 @@ Exceptions common to OpenStack projects
 
 import logging
 
-from designate.openstack.common.gettextutils import _
+from designate.i18n import _
 
 _FATAL_EXCEPTION_FORMAT_ERRORS = False
 

designate/openstack/deprecated/wsgi.py

@@ -35,7 +35,7 @@ import webob.exc
 from xml.dom import minidom
 from xml.parsers import expat
 
-from designate.openstack.common.gettextutils import _
+from designate.i18n import _
 from designate.openstack.common import jsonutils
 from designate.openstack.common import log as logging
 from designate.openstack.common import service

designate/policy.py

@@ -17,8 +17,8 @@ from oslo.config import cfg
 
 from designate.openstack.common import log as logging
 from designate.openstack.common import policy
-from designate.openstack.common.gettextutils import _
-from designate.openstack.common.gettextutils import _LI
+from designate.i18n import _
+from designate.i18n import _LI
 from designate import utils
 from designate import exceptions
 

designate/service.py

@@ -22,7 +22,7 @@ from oslo.config import cfg
 
 from designate.openstack.common import service
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _
+from designate.i18n import _
 from designate import rpc
 from designate import version
 

designate/sink/service.py

@@ -19,7 +19,7 @@ from oslo import messaging
 
 from designate.openstack.common import log as logging
 from designate.openstack.common import service
-from designate.openstack.common.gettextutils import _LW
+from designate.i18n import _LW
 from designate import notification_handler
 from designate import rpc
 

designate/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py

@@ -17,7 +17,7 @@ from sqlalchemy import MetaData, Table, Column, Integer
 
 from designate.openstack.common import timeutils
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LW
+from designate.i18n import _LW
 
 
 LOG = logging.getLogger(__name__)

designate/storage/impl_sqlalchemy/migrate_repo/versions/015_add_unique_record_constraint.py

@@ -20,7 +20,7 @@ from sqlalchemy.schema import Table, Column, MetaData
 from sqlalchemy.types import String
 
 from designate.openstack.common import log as logging
-from designate.openstack.common.gettextutils import _LW
+from designate.i18n import _LW
 
 
 LOG = logging.getLogger(__name__)

openstack-common.conf

@@ -7,7 +7,6 @@ script=tools/install_venv_common.py
 module=context
 module=excutils
 module=fixture.config
-module=gettextutils
 module=importutils
 module=jsonutils
 module=local

requirements.txt

@@ -25,3 +25,4 @@ WebOb>=1.2.3
 dnspython>=1.9.4
 posix_ipc
 oslo.db>=0.2.0  # Apache-2.0
+oslo.i18n>=0.1.0  # Apache-2.0