Use oslo.i18n

oslo.i18n provides the i18n function that were provided by
oslo-incubator's gettextutils module.

Change-Id: I1f361a8321fb02f03b4f3f3e2ef688fcf19514a3

diff --git a/bin/cinder-all b/bin/cinder-all
index 7243712bb9e38c2e024c23be52181bb5c1620ded..d062d4793cea2c2a1e0c498c992b19ae24c6b7aa 100755 (executable)
--- a/bin/cinder-all
+++ b/bin/cinder-all
@@ -44,12 +44,12 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")):
     sys.path.insert(0, possible_topdir)
 
-from cinder.openstack.common import gettextutils
-gettextutils.enable_lazy()
+from cinder import i18n
+i18n.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config   # noqa
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import service
 from cinder import utils

diff --git a/bin/cinder-api b/bin/cinder-api
index 6be285476c51348e98107e49253562f12c0a0dc3..dca7541765f60af12006e521b49dee4ae497c8a6 100755 (executable)
--- a/bin/cinder-api
+++ b/bin/cinder-api
@@ -34,8 +34,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")):
     sys.path.insert(0, possible_topdir)
 
-from cinder.openstack.common import gettextutils
-gettextutils.enable_lazy()
+from cinder import i18n
+i18n.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa

diff --git a/bin/cinder-backup b/bin/cinder-backup
index fa747a63f762579d6c8d035b6a4b2328f7b28e0c..1b474d3ba584540c2dd288a9d320e33883ba9c31 100755 (executable)
--- a/bin/cinder-backup
+++ b/bin/cinder-backup
@@ -38,8 +38,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from cinder.openstack.common import gettextutils
-gettextutils.enable_lazy()
+from cinder import i18n
+i18n.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa

diff --git a/bin/cinder-manage b/bin/cinder-manage
index 0b25ae3abe39dcf23b61082567e81729ae96790d..85f459a7cc998b26421c6f57c22ee08e8e416434 100755 (executable)
--- a/bin/cinder-manage
+++ b/bin/cinder-manage
@@ -72,15 +72,15 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
-from cinder.openstack.common import gettextutils
-gettextutils.enable_lazy()
+from cinder import i18n
+i18n.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa
 from cinder import context
 from cinder import db
 from cinder.db import migration
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import uuidutils
 from cinder import rpc

diff --git a/bin/cinder-rtstool b/bin/cinder-rtstool
index fd61d2635592b4d9f8605a0cfe9543cf99a9cf52..155dd6d49e2592abe549e3ad52752e619c1d5d42 100755 (executable)
--- a/bin/cinder-rtstool
+++ b/bin/cinder-rtstool
@@ -19,11 +19,10 @@ import sys
 
 import rtslib
 
-from cinder.openstack.common import gettextutils
-from cinder.openstack.common.gettextutils import _
+from cinder import i18n
+from cinder.i18n import _
 
-gettextutils.install('cinder')
-gettextutils.enable_lazy()
+i18n.enable_lazy()
 
 
 class RtstoolError(Exception):

diff --git a/bin/cinder-scheduler b/bin/cinder-scheduler
index cc04e22329d2327025faaa912fa2c9018f5b382c..9c5a8af0aab1885b1256ad517dedd04e8c9521cf 100755 (executable)
--- a/bin/cinder-scheduler
+++ b/bin/cinder-scheduler
@@ -38,8 +38,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from cinder.openstack.common import gettextutils
-gettextutils.enable_lazy()
+from cinder import i18n
+i18n.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa

diff --git a/bin/cinder-volume b/bin/cinder-volume
index f0fb798f9fd07b246ea67cf4e1ed92d1fb12d922..8a51231cf19b0776642ee17eb645f7576df63dc6 100755 (executable)
--- a/bin/cinder-volume
+++ b/bin/cinder-volume
@@ -42,8 +42,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from cinder.openstack.common import gettextutils
-gettextutils.enable_lazy()
+from cinder import i18n
+i18n.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa

diff --git a/bin/cinder-volume-usage-audit b/bin/cinder-volume-usage-audit
index 2b143dc87073f5fd829d56cb7222cfa22cfb49b1..caa1dee9f1fafad2d6c078f6551d5b25aab5c9a9 100755 (executable)
--- a/bin/cinder-volume-usage-audit
+++ b/bin/cinder-volume-usage-audit
@@ -52,12 +52,12 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
-from cinder.openstack.common import gettextutils
-gettextutils.enable_lazy()
+from cinder import i18n
+i18n.enable_lazy()
 
 from cinder import context
 from cinder import db
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import rpc
 from cinder import utils

diff --git a/cinder/api/auth.py b/cinder/api/auth.py
index df9c130c24ac379af759c31d2183c53f6c61af67..ca61179cfca65aef984040d82728cfa1f56c7a6b 100644 (file)
--- a/cinder/api/auth.py
+++ b/cinder/api/auth.py
@@ -15,7 +15,7 @@
 #    under the License.
 
 from cinder.api.middleware import auth
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/api/common.py b/cinder/api/common.py
index 5574352a765dc03872c74ebc106be9f0bc62ed63..ad7a8ddf72c19461e24f370895a681d49c93a1c1 100644 (file)
--- a/cinder/api/common.py
+++ b/cinder/api/common.py
@@ -23,7 +23,7 @@ import webob
 
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 

diff --git a/cinder/api/contrib/admin_actions.py b/cinder/api/contrib/admin_actions.py
index 99e513345073e94912b5d5c56df5cf2f6441acf8..bfd6f94d639219ffd10efb5b4e836abe3fa941c2 100644 (file)
--- a/cinder/api/contrib/admin_actions.py
+++ b/cinder/api/contrib/admin_actions.py
@@ -19,7 +19,7 @@ from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder import rpc

diff --git a/cinder/api/contrib/backups.py b/cinder/api/contrib/backups.py
index 7547dc2c54c34b4a9d3357de7c4cdb1f642e2a78..8ce51dc79d8fa6eedbec82fdbef8070da5ddbbbf 100644 (file)
--- a/cinder/api/contrib/backups.py
+++ b/cinder/api/contrib/backups.py
@@ -26,7 +26,7 @@ from cinder.api.views import backups as backup_views
 from cinder.api import xmlutil
 from cinder import backup as backupAPI
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 

diff --git a/cinder/api/contrib/extended_snapshot_attributes.py b/cinder/api/contrib/extended_snapshot_attributes.py
index f21cfd393c063466070efea6e3920f0dec2c3b8e..34e0151c5c0fa9805d3baecb03e7679572bbc697 100644 (file)
--- a/cinder/api/contrib/extended_snapshot_attributes.py
+++ b/cinder/api/contrib/extended_snapshot_attributes.py
@@ -21,7 +21,7 @@ from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import volume
 

diff --git a/cinder/api/contrib/hosts.py b/cinder/api/contrib/hosts.py
index 824106f256e9c3e0e5669e99a0f122dc05c27fc2..0d6dc4ea112d5c334ecd3098eb3054d486d194ce 100644 (file)
--- a/cinder/api/contrib/hosts.py
+++ b/cinder/api/contrib/hosts.py
@@ -25,7 +25,7 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder import utils

diff --git a/cinder/api/contrib/qos_specs_manage.py b/cinder/api/contrib/qos_specs_manage.py
index 5abbd7a3e44d28f2a985c2e017dc479410d48f08..dadc1d1819c9066e306d61eb4da666d64a6931b4 100644 (file)
--- a/cinder/api/contrib/qos_specs_manage.py
+++ b/cinder/api/contrib/qos_specs_manage.py
@@ -23,7 +23,7 @@ from cinder.api.openstack import wsgi
 from cinder.api.views import qos_specs as view_qos_specs
 from cinder.api import xmlutil
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder import rpc

diff --git a/cinder/api/contrib/quota_classes.py b/cinder/api/contrib/quota_classes.py
index a5df4a1c0aa776eb70d92fad3686e590ce7dbee0..ef74413d25abfa46226ac8fdeab3a38413f5624a 100644 (file)
--- a/cinder/api/contrib/quota_classes.py
+++ b/cinder/api/contrib/quota_classes.py
@@ -20,7 +20,7 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder import quota
 
 

diff --git a/cinder/api/contrib/quotas.py b/cinder/api/contrib/quotas.py
index 739eb1e2e0b55d4359e94278c72e8f12ebb8db1e..a7de8d5366c5f3980c6e2aecd609793f7d66284a 100644 (file)
--- a/cinder/api/contrib/quotas.py
+++ b/cinder/api/contrib/quotas.py
@@ -21,7 +21,7 @@ from cinder.api import xmlutil
 from cinder import db
 from cinder.db.sqlalchemy import api as sqlalchemy_api
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import strutils
 from cinder import quota
 

diff --git a/cinder/api/contrib/scheduler_hints.py b/cinder/api/contrib/scheduler_hints.py
index c7d8cf96fd0d1ccdbed7a5eb9bf8b1384753e174..190772883316267288671c9d54d2151c8ff08c67 100644 (file)
--- a/cinder/api/contrib/scheduler_hints.py
+++ b/cinder/api/contrib/scheduler_hints.py
@@ -17,7 +17,7 @@ import webob.exc
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder.api.v2 import volumes
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/api/contrib/services.py b/cinder/api/contrib/services.py
index 7bec9c3e1479bbc5362212b2cf4b3198f1a61ed1..88a408699017329f5b5c2a9506c15a26b9ce089d 100644 (file)
--- a/cinder/api/contrib/services.py
+++ b/cinder/api/contrib/services.py
@@ -22,7 +22,7 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder import utils

diff --git a/cinder/api/contrib/snapshot_actions.py b/cinder/api/contrib/snapshot_actions.py
index e50e7fb25cbce2ca09dba2b330bcf8da3fb233c4..1b33fab4ed8ab35305553856b64eea1b47dc9f55 100644 (file)
--- a/cinder/api/contrib/snapshot_actions.py
+++ b/cinder/api/contrib/snapshot_actions.py
@@ -17,7 +17,7 @@ import webob
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder import db
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/api/contrib/types_extra_specs.py b/cinder/api/contrib/types_extra_specs.py
index 175f87aef973c76864085fa98f9c6e55ee683dd9..951368a75403e3868493fc971a8683d26eb15e90 100644 (file)
--- a/cinder/api/contrib/types_extra_specs.py
+++ b/cinder/api/contrib/types_extra_specs.py
@@ -23,7 +23,7 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder import rpc
 from cinder.volume import volume_types
 

diff --git a/cinder/api/contrib/types_manage.py b/cinder/api/contrib/types_manage.py
index 7a175f4355de3b9f8252b989fdee3e6725120a84..bbe530269ca74f37d07138f15c9e5a186ea6126c 100644 (file)
--- a/cinder/api/contrib/types_manage.py
+++ b/cinder/api/contrib/types_manage.py
@@ -23,7 +23,7 @@ from cinder.api.openstack import wsgi
 from cinder.api.v1 import types
 from cinder.api.views import types as views_types
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder import rpc
 from cinder.volume import volume_types
 

diff --git a/cinder/api/contrib/volume_actions.py b/cinder/api/contrib/volume_actions.py
index 31c039f9a00f115f5dcb1a6bb69ea177bfee7445..88048d4262654de6615ac3bf0eb636d975018821 100644 (file)
--- a/cinder/api/contrib/volume_actions.py
+++ b/cinder/api/contrib/volume_actions.py
@@ -20,7 +20,7 @@ from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder import utils

diff --git a/cinder/api/contrib/volume_manage.py b/cinder/api/contrib/volume_manage.py
index c9303c5a7cec9d4feb59ffc6fadcfd4e559e0472..07a7545a6d326f67d4d8726c200de1df9dce4c6c 100755 (executable)
--- a/cinder/api/contrib/volume_manage.py
+++ b/cinder/api/contrib/volume_manage.py
@@ -20,7 +20,7 @@ from cinder.api.openstack import wsgi
 from cinder.api.v2.views import volumes as volume_views
 from cinder.api.v2 import volumes
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import uuidutils
 from cinder import utils

diff --git a/cinder/api/contrib/volume_transfer.py b/cinder/api/contrib/volume_transfer.py
index a3e7deb8e7b1b55fd91ca452d0d0704aedd9a9c8..f510aa69418910cd3be83db04a7f14228e891434 100644 (file)
--- a/cinder/api/contrib/volume_transfer.py
+++ b/cinder/api/contrib/volume_transfer.py
@@ -23,7 +23,7 @@ from cinder.api.views import transfers as transfer_view
 from cinder.api import xmlutil
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import transfer as transferAPI
 from cinder import utils

diff --git a/cinder/api/contrib/volume_type_encryption.py b/cinder/api/contrib/volume_type_encryption.py
index c29cbd190126bc62ca066151e87daa938867889a..9cbfc7ae6a03fa39124c7051437c569fbd220b54 100644 (file)
--- a/cinder/api/contrib/volume_type_encryption.py
+++ b/cinder/api/contrib/volume_type_encryption.py
@@ -22,7 +22,7 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder import rpc
 from cinder.volume import volume_types
 

diff --git a/cinder/api/contrib/volume_unmanage.py b/cinder/api/contrib/volume_unmanage.py
index 6486ffa16c3bb22cf63fd0a7c551da1b14ca82f5..4eeba5abcf9d0ef930e1ca8d56e7191545d91797 100755 (executable)
--- a/cinder/api/contrib/volume_unmanage.py
+++ b/cinder/api/contrib/volume_unmanage.py
@@ -18,7 +18,7 @@ from webob import exc
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import volume
 

diff --git a/cinder/api/extensions.py b/cinder/api/extensions.py
index 6209433e5571d5e1168d7e882360d735be7d16a2..1e040388f939a75b3bef17555a775c9feef70680 100644 (file)
--- a/cinder/api/extensions.py
+++ b/cinder/api/extensions.py
@@ -24,7 +24,7 @@ import cinder.api.openstack
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 import cinder.policy

diff --git a/cinder/api/middleware/auth.py b/cinder/api/middleware/auth.py
index 2522dbd4139a1a76a75560b71b520af0f5fd86db..74d3afbbfcd520c530aaa25980e68507d6b71d93 100644 (file)
--- a/cinder/api/middleware/auth.py
+++ b/cinder/api/middleware/auth.py
@@ -26,7 +26,7 @@ import webob.exc
 
 from cinder.api.openstack import wsgi
 from cinder import context
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.middleware import request_id

diff --git a/cinder/api/middleware/fault.py b/cinder/api/middleware/fault.py
index 0472bef4fa4ba2e41d7d2333fbad3499f8611507..b312ae636cddefdfcf81ea50d01ca6f336fd5f34 100644 (file)
--- a/cinder/api/middleware/fault.py
+++ b/cinder/api/middleware/fault.py
@@ -19,7 +19,7 @@ import webob.exc
 
 from cinder.api.openstack import wsgi
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder import wsgi as base_wsgi

diff --git a/cinder/api/middleware/sizelimit.py b/cinder/api/middleware/sizelimit.py
index 85fccb56b40570ebe6864daf0284c7d0db32716c..b87db3366628a9f422df25928f6f8f8d731a7e71 100644 (file)
--- a/cinder/api/middleware/sizelimit.py
+++ b/cinder/api/middleware/sizelimit.py
@@ -21,7 +21,7 @@ from oslo.config import cfg
 import webob.dec
 import webob.exc
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import wsgi
 

diff --git a/cinder/api/openstack/__init__.py b/cinder/api/openstack/__init__.py
index ea046fed797354452c232527257216233e6df1ce..7cc1d1fa2a5979da0fa8d107a5da1f6d8b75be76 100644 (file)
--- a/cinder/api/openstack/__init__.py
+++ b/cinder/api/openstack/__init__.py
@@ -21,7 +21,7 @@ WSGI middleware for OpenStack API controllers.
 import routes
 
 from cinder.api.openstack import wsgi
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import wsgi as base_wsgi
 

diff --git a/cinder/api/openstack/urlmap.py b/cinder/api/openstack/urlmap.py
index 92bd1540637f31efffde69a7efdfa3afa5520400..84b13c68ff2124967c60ef99eb20fd0fa2b083ae 100644 (file)
--- a/cinder/api/openstack/urlmap.py
+++ b/cinder/api/openstack/urlmap.py
@@ -15,7 +15,7 @@
 #    under the License.
 
 from cinder.api import urlmap
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/api/openstack/volume/__init__.py b/cinder/api/openstack/volume/__init__.py
index 90894c0944e3567a668db37fb5ce097c473c5cd7..e4a819d29e229449100a72e1ee6275b35f807ccb 100644 (file)
--- a/cinder/api/openstack/volume/__init__.py
+++ b/cinder/api/openstack/volume/__init__.py
@@ -15,7 +15,7 @@
 #    under the License.
 
 from cinder.api.v1.router import APIRouter as v1_router
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/api/openstack/volume/versions.py b/cinder/api/openstack/volume/versions.py
index e8596dc1747ea3c9215e2e52b3a7fdb6dadcb786..c403876a6e9aa08538687b2b3eda7ad66f24bea0 100644 (file)
--- a/cinder/api/openstack/volume/versions.py
+++ b/cinder/api/openstack/volume/versions.py
@@ -15,7 +15,7 @@
 #    under the License.
 
 from cinder.api import versions
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/api/openstack/wsgi.py b/cinder/api/openstack/wsgi.py
index 9fb59b2f6f9bc3c5024738bdbf3c00e2a974280a..657291dae7961172d40b0dbf1f4556b55b82a197 100644 (file)
--- a/cinder/api/openstack/wsgi.py
+++ b/cinder/api/openstack/wsgi.py
@@ -25,8 +25,8 @@ from xml.dom import minidom
 from xml.parsers import expat
 
 from cinder import exception
-from cinder.openstack.common import gettextutils
-from cinder.openstack.common.gettextutils import _
+from cinder import i18n
+from cinder.i18n import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder import utils
@@ -177,7 +177,7 @@ class Request(webob.Request):
         """
         if not self.accept_language:
             return None
-        all_languages = gettextutils.get_available_languages('cinder')
+        all_languages = i18n.get_available_languages()
         return self.accept_language.best_match(all_languages)
 
 
@@ -1159,7 +1159,7 @@ class Fault(webob.exc.HTTPException):
         fault_data = {
             fault_name: {
                 'code': code,
-                'message': gettextutils.translate(explanation, locale)}}
+                'message': i18n.translate(explanation, locale)}}
         if code == 413:
             retry = self.wrapped_exc.headers.get('Retry-After', None)
             if retry:
@@ -1222,7 +1222,7 @@ class OverLimitFault(webob.exc.HTTPException):
 
         def translate(msg):
             locale = request.best_match_language()
-            return gettextutils.translate(msg, locale)
+            return i18n.translate(msg, locale)
 
         self.content['overLimitFault']['message'] = \
             translate(self.content['overLimitFault']['message'])

diff --git a/cinder/api/sizelimit.py b/cinder/api/sizelimit.py
index dd19efd01d571d5b6123ce6677200ab63eef43ce..638432291f65327a82a8e03de2e17f5ada72e529 100644 (file)
--- a/cinder/api/sizelimit.py
+++ b/cinder/api/sizelimit.py
@@ -15,7 +15,7 @@
 #    under the License.
 
 from cinder.api.middleware import sizelimit
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/api/v1/limits.py b/cinder/api/v1/limits.py
index de70243f98521beb429bc77504951e968fa79caa..cf9be30adf92e9bd5f43cd26a23079da881e352c 100644 (file)
--- a/cinder/api/v1/limits.py
+++ b/cinder/api/v1/limits.py
@@ -30,7 +30,7 @@ import webob.exc
 from cinder.api.openstack import wsgi
 from cinder.api.views import limits as limits_views
 from cinder.api import xmlutil
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import jsonutils
 from cinder import quota

diff --git a/cinder/api/v1/snapshot_metadata.py b/cinder/api/v1/snapshot_metadata.py
index 17bc5ae816e8274533759dbe2dc0582a5a793327..d1913f493fbdfaa581ee7a340bea53bc00b2451b 100644 (file)
--- a/cinder/api/v1/snapshot_metadata.py
+++ b/cinder/api/v1/snapshot_metadata.py
@@ -18,7 +18,7 @@ import webob
 from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder import volume
 from webob import exc
 

diff --git a/cinder/api/v1/snapshots.py b/cinder/api/v1/snapshots.py
index 8ec4954fc225c745a27b09900bd6dedc6aa63d33..7960230f6b59de317e7aef4b1c59193bdcf61fc6 100644 (file)
--- a/cinder/api/v1/snapshots.py
+++ b/cinder/api/v1/snapshots.py
@@ -22,7 +22,7 @@ from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder import utils

diff --git a/cinder/api/v1/volume_metadata.py b/cinder/api/v1/volume_metadata.py
index b01ec6f015d7093456c91f19f94f548080f371bb..8130f627ccce1fe8970cc5e7bca277551d2aa151 100644 (file)
--- a/cinder/api/v1/volume_metadata.py
+++ b/cinder/api/v1/volume_metadata.py
@@ -18,7 +18,7 @@ import webob
 from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder import volume
 from webob import exc
 

diff --git a/cinder/api/v1/volumes.py b/cinder/api/v1/volumes.py
index c262b5ca0ecae070eaea2694d7419ed8e685dde4..ebf195a89a5d3e7d4e2cea498838abcef53e6b3d 100644 (file)
--- a/cinder/api/v1/volumes.py
+++ b/cinder/api/v1/volumes.py
@@ -23,7 +23,7 @@ from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import uuidutils
 from cinder import utils

diff --git a/cinder/api/v2/limits.py b/cinder/api/v2/limits.py
index a373bf9cd750be3955fc0737e9aad3dfac0fe12e..b285b08b5128b91a9999434328a686233b92b782 100644 (file)
--- a/cinder/api/v2/limits.py
+++ b/cinder/api/v2/limits.py
@@ -30,7 +30,7 @@ import webob.exc
 from cinder.api.openstack import wsgi
 from cinder.api.views import limits as limits_views
 from cinder.api import xmlutil
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import jsonutils
 from cinder import quota

diff --git a/cinder/api/v2/snapshot_metadata.py b/cinder/api/v2/snapshot_metadata.py
index 17bc5ae816e8274533759dbe2dc0582a5a793327..d1913f493fbdfaa581ee7a340bea53bc00b2451b 100644 (file)
--- a/cinder/api/v2/snapshot_metadata.py
+++ b/cinder/api/v2/snapshot_metadata.py
@@ -18,7 +18,7 @@ import webob
 from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder import volume
 from webob import exc
 

diff --git a/cinder/api/v2/snapshots.py b/cinder/api/v2/snapshots.py
index 2af416303ecdaa49d4831bf9a7b65594b3a32953..68c72f68562558123667ca157cc96360fd45c925 100644 (file)
--- a/cinder/api/v2/snapshots.py
+++ b/cinder/api/v2/snapshots.py
@@ -22,7 +22,7 @@ from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder import utils

diff --git a/cinder/api/v2/types.py b/cinder/api/v2/types.py
index c25c9eb0219774bc584238fa269244fa0364bed9..fa37dc56ae3e4056e389b1f306ba2df0fb10a1d7 100644 (file)
--- a/cinder/api/v2/types.py
+++ b/cinder/api/v2/types.py
@@ -21,7 +21,7 @@ from cinder.api.openstack import wsgi
 from cinder.api.views import types as views_types
 from cinder.api import xmlutil
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.volume import volume_types
 
 

diff --git a/cinder/api/v2/volume_metadata.py b/cinder/api/v2/volume_metadata.py
index e11c6bbc89d0f98bfcebb8bca21528bd5a8f0259..d34d40c126de6b0fc82da42b3882575e9d996b44 100644 (file)
--- a/cinder/api/v2/volume_metadata.py
+++ b/cinder/api/v2/volume_metadata.py
@@ -18,7 +18,7 @@ import webob
 from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder import volume
 
 

diff --git a/cinder/api/v2/volumes.py b/cinder/api/v2/volumes.py
index 9945f1207731e43ef50fefe2bd947a928c03662c..e218e1b5b6ce56cbab724b14062e253da5b78919 100644 (file)
--- a/cinder/api/v2/volumes.py
+++ b/cinder/api/v2/volumes.py
@@ -25,7 +25,7 @@ from cinder.api.openstack import wsgi
 from cinder.api.v2.views import volumes as volume_views
 from cinder.api import xmlutil
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import uuidutils
 from cinder import utils

diff --git a/cinder/api/xmlutil.py b/cinder/api/xmlutil.py
index 364ff3d6ef370264e89d02d7163fe9c7e432bde9..de69fc975be42c74366af47c8e578d3b420793f7 100644 (file)
--- a/cinder/api/xmlutil.py
+++ b/cinder/api/xmlutil.py
@@ -17,7 +17,7 @@ import os.path
 
 from lxml import etree
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder import utils
 
 

diff --git a/cinder/backup/api.py b/cinder/backup/api.py
index ae943e44e96d28949429c905c8e81cae240b7dd7..090db2769bce79355dcf0f0fa015c4cc65de2cc1 100644 (file)
--- a/cinder/backup/api.py
+++ b/cinder/backup/api.py
@@ -26,7 +26,7 @@ from cinder.backup import rpcapi as backup_rpcapi
 from cinder import context
 from cinder.db import base
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 

diff --git a/cinder/backup/driver.py b/cinder/backup/driver.py
index b69ca53db8e061a5730f0016262fdf12f2c0fddc..04c84fb28e443c6e6aeb6c68bd692832e1db51cd 100644 (file)
--- a/cinder/backup/driver.py
+++ b/cinder/backup/driver.py
@@ -17,7 +17,7 @@
 
 from cinder.db import base
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from oslo.config import cfg

diff --git a/cinder/backup/drivers/ceph.py b/cinder/backup/drivers/ceph.py
index a60ae691b49a61c99f2f25f0eb13a9d554ca2ac4..2a57978b2bf661a337505622a55e384ec29df604 100644 (file)
--- a/cinder/backup/drivers/ceph.py
+++ b/cinder/backup/drivers/ceph.py
@@ -53,8 +53,8 @@ from oslo.config import cfg
 
 from cinder.backup.driver import BackupDriver
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder.openstack.common import units

diff --git a/cinder/backup/drivers/swift.py b/cinder/backup/drivers/swift.py
index 9777a24fa17c0e7958e61847ef4af2429a0948ac..1c1751f31459747c68f0dbe753c599a1da134b8a 100644 (file)
--- a/cinder/backup/drivers/swift.py
+++ b/cinder/backup/drivers/swift.py
@@ -41,8 +41,8 @@ from oslo.config import cfg
 
 from cinder.backup.driver import BackupDriver
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import units

diff --git a/cinder/backup/drivers/tsm.py b/cinder/backup/drivers/tsm.py
index 520b808dd2f652dcd6721f7fefcd21d52c2450a2..b2c085a9dfdda7c7cccfbf9db314bda0b222e4ec 100644 (file)
--- a/cinder/backup/drivers/tsm.py
+++ b/cinder/backup/drivers/tsm.py
@@ -33,7 +33,7 @@ from oslo.config import cfg
 
 from cinder.backup.driver import BackupDriver
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder import utils

diff --git a/cinder/backup/manager.py b/cinder/backup/manager.py
index d20e4440ffe247d38d804fca9620390103e78c2d..e6ac5446ee1d37526eaf8d305ccd833224ba768d 100644 (file)
--- a/cinder/backup/manager.py
+++ b/cinder/backup/manager.py
@@ -39,9 +39,9 @@ from oslo import messaging
 from cinder.backup import rpcapi as backup_rpcapi
 from cinder import context
 from cinder import exception
+from cinder.i18n import _
 from cinder import manager
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder import utils

diff --git a/cinder/brick/exception.py b/cinder/brick/exception.py
index 59a953c7966b7e2449fcfb73711a4bc906465d8c..598dca24a03b84cccf007c4c0a26af9244ba5997 100644 (file)
--- a/cinder/brick/exception.py
+++ b/cinder/brick/exception.py
@@ -14,7 +14,7 @@
 
 """Exceptions for the Brick library."""
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/brick/initiator/connector.py b/cinder/brick/initiator/connector.py
index 52c6b8355b0c2525e73b56baa76d1811fc7aa599..b58e726b2d67b8e8777e65520ace4f025bce4ddb 100644 (file)
--- a/cinder/brick/initiator/connector.py
+++ b/cinder/brick/initiator/connector.py
@@ -23,7 +23,7 @@ from cinder.brick.initiator import host_driver
 from cinder.brick.initiator import linuxfc
 from cinder.brick.initiator import linuxscsi
 from cinder.brick.remotefs import remotefs
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall

diff --git a/cinder/brick/initiator/linuxfc.py b/cinder/brick/initiator/linuxfc.py
index 2b6099c825470aacd94014355a4b8493bdd5ab3f..391f747b65bb920cc0efe74b2df3bddacc957b80 100644 (file)
--- a/cinder/brick/initiator/linuxfc.py
+++ b/cinder/brick/initiator/linuxfc.py
@@ -17,7 +17,7 @@
 import errno
 
 from cinder.brick.initiator import linuxscsi
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils as putils
 

diff --git a/cinder/brick/initiator/linuxscsi.py b/cinder/brick/initiator/linuxscsi.py
index 9e023aac3813c1f3ec5e0abf7cd6b49a2c32ebec..54da3111736082ea611a8a3177f1c8121ef1fc6d 100644 (file)
--- a/cinder/brick/initiator/linuxscsi.py
+++ b/cinder/brick/initiator/linuxscsi.py
@@ -19,7 +19,7 @@
 import os
 
 from cinder.brick import executor
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils as putils
 

diff --git a/cinder/brick/iscsi/iscsi.py b/cinder/brick/iscsi/iscsi.py
index c42798048d12345a67659b4e1846b833bace74d0..eee84ad8ed7b5a57998c149200d1365a3224ecad 100644 (file)
--- a/cinder/brick/iscsi/iscsi.py
+++ b/cinder/brick/iscsi/iscsi.py
@@ -26,8 +26,8 @@ import time
 
 from cinder.brick import exception
 from cinder.brick import executor
+from cinder.i18n import _
 from cinder.openstack.common import fileutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils as putils
 

diff --git a/cinder/brick/local_dev/lvm.py b/cinder/brick/local_dev/lvm.py
index 5f5aad2804b93242b064bc0c245872bef3521bef..798075f7c31564efacaf8837d0e4bee1139107e8 100644 (file)
--- a/cinder/brick/local_dev/lvm.py
+++ b/cinder/brick/local_dev/lvm.py
@@ -24,7 +24,7 @@ import itertools
 
 from cinder.brick import exception
 from cinder.brick import executor
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils as putils
 

diff --git a/cinder/brick/remotefs/remotefs.py b/cinder/brick/remotefs/remotefs.py
index ccc4f7fccb33a8e67d057db216606a930408a5cc..4b67d1e45d061ffbd3e16aa3a6ec733b36eb7c44 100755 (executable)
--- a/cinder/brick/remotefs/remotefs.py
+++ b/cinder/brick/remotefs/remotefs.py
@@ -21,7 +21,7 @@ import re
 import six
 
 from cinder.brick import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils as putils
 

diff --git a/cinder/common/config.py b/cinder/common/config.py
index ce51bb911e49f25b79c9973eaf6857fd007a579a..9e9db35f75a32095eb81b1e4ad316cb9be93524f 100644 (file)
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -29,7 +29,7 @@ import socket
 
 from oslo.config import cfg
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 
 
 CONF = cfg.CONF

diff --git a/cinder/common/sqlalchemyutils.py b/cinder/common/sqlalchemyutils.py
index f2c5f4534bb655e7900b65b9c14dabfb9bf73f4b..a496893377259ac7ed54a55848e5c1ddcf3eb995 100644 (file)
--- a/cinder/common/sqlalchemyutils.py
+++ b/cinder/common/sqlalchemyutils.py
@@ -21,7 +21,7 @@
 import sqlalchemy
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/context.py b/cinder/context.py
index 6b2c6c3d82d167dae823b727d65b71fc15c68284..cfb6dd8aba5476736942b26c334ba2947d791dec 100644 (file)
--- a/cinder/context.py
+++ b/cinder/context.py
@@ -20,7 +20,7 @@
 import copy
 import uuid
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import local
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils

diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py
index fb1595f0da34917beb4bc2bad7ef2b28d7c46989..2ad31ef35231ddc5ca373d21ebd859b2152ec937 100644 (file)
--- a/cinder/db/sqlalchemy/api.py
+++ b/cinder/db/sqlalchemy/api.py
@@ -40,7 +40,7 @@ from sqlalchemy.sql import func
 from cinder.common import sqlalchemyutils
 from cinder.db.sqlalchemy import models
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import uuidutils

diff --git a/cinder/db/sqlalchemy/migrate_repo/manage.py b/cinder/db/sqlalchemy/migrate_repo/manage.py
index d468a310707b50d1a46f7add86e2c89aeeb12721..d12e891882fa7778e9a65e999c2768d0f9a33434 100755 (executable)
--- a/cinder/db/sqlalchemy/migrate_repo/manage.py
+++ b/cinder/db/sqlalchemy/migrate_repo/manage.py
@@ -17,8 +17,8 @@ import os
 
 from oslo.config import cfg
 
-from cinder.openstack.common import gettextutils
-gettextutils.enable_lazy()
+from cinder import i18n
+i18n.enable_lazy()
 
 from cinder.db.sqlalchemy import migrate_repo
 from cinder import version

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py b/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py
index 40a54fcb2f1d1ee9a609f67353d9837dfa2ac603..ab85a7c1ec5e7f13f25a9673d6fcdcf6f997d87b 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py
@@ -16,7 +16,7 @@
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey
 from sqlalchemy import Integer, MetaData, String, Table
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
index 4f3d65d61a5af65b5f4b5dcd3423e0d3a72055cc..da97a6f97fc0a371138fe1aa22b693430db6c0b9 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
@@ -16,7 +16,7 @@ from migrate import ForeignKeyConstraint
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import MetaData, Integer, String, Table, ForeignKey
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py b/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py
index ba37edb76e17addf57bb99a461eac431d9e8bcf8..8c3ae7b90571a4f5a01bbb5f2fb9fd6bd548dac6 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py
@@ -15,7 +15,7 @@
 from sqlalchemy import Column, DateTime, Text, Boolean
 from sqlalchemy import MetaData, Integer, String, Table, ForeignKey
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py b/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
index 95ef42ea279c60df67716b94ea4db2adb4a5ed7d..22b2eeda256d02b56e2c7621149e7145b3142822 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
@@ -16,7 +16,7 @@
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import MetaData, Integer, String, Table
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py
index b1afc52a902040159f5efe3d858a8489c621d2d3..90dfdfe1739cb090aa02da35e4607600cca9f34c 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py
@@ -13,7 +13,7 @@
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import Integer, MetaData, String, Table, ForeignKey
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py
index 248bee45e0d829b4489279bb47b12215c4790e01..37d129293c33d3165137d423e7370e57d4f8c433 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py
@@ -13,7 +13,7 @@
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import MetaData, String, Table, ForeignKey
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py
index b69ff346e997771765037eae8bafbfb9cf4a6585..8fda7123bfa9a35d770847b9deb9656bf54ba428 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py
@@ -13,7 +13,7 @@
 from sqlalchemy import Boolean, Column, DateTime, Integer
 from sqlalchemy import MetaData, String, Table
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py b/cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py
index f20b6fd0ce6106d5490aaad97f086d5008287781..e6b6ccd451a5afd6286e4285774283971c79955f 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py
@@ -15,7 +15,7 @@
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey
 from sqlalchemy import Integer, MetaData, String, Table
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py b/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py
index 0d42b293d342a3fd69b7165a821545e2aa70b947..d2f7eedf1e0d16414b92568e39d8004f7debcd77 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py
@@ -16,7 +16,7 @@
 from sqlalchemy import Column, ForeignKey, MetaData, Table
 from sqlalchemy import Boolean, DateTime, Integer, String
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py b/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py
index 45220b4828a3177dc2748c36396fc482b44da188..6be70cb4a4ae58784b6ca3b6adcb2b2f7b500c9c 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py
@@ -18,7 +18,7 @@ from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import ForeignKey, MetaData, String, Table
 from migrate import ForeignKeyConstraint
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py
index e9fd7ba124e80eae16de1b8197bf9f3956f37b11..e8cdee8d453b362a3f4dc0a91aecbbd8a013bf4d 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py
@@ -13,7 +13,7 @@
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import Integer, MetaData, String, Table, ForeignKey
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py
index 000aeab1dd4d4c101075d854b572f79c3e8164ba..f09bf395177f5c3a3485b04e56c734e785578d48 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py
@@ -14,7 +14,7 @@
 
 import datetime
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from oslo.config import cfg
 from sqlalchemy import MetaData, Table

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/023_add_expire_reservations_index.py b/cinder/db/sqlalchemy/migrate_repo/versions/023_add_expire_reservations_index.py
index 996ebbdfcba2bb05a20b3d8cfebe4f6d3f4288d9..c8a0e7fdfc45570745052d759b54eda23e72542a 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/023_add_expire_reservations_index.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/023_add_expire_reservations_index.py
@@ -14,7 +14,7 @@
 
 from sqlalchemy import Index, MetaData, Table
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/db/sqlalchemy/migration.py b/cinder/db/sqlalchemy/migration.py
index 6a7ae61ca741d944e19f3598c394083e10e63c97..f6aa7c5fe35bb389b0c96569dd758e27bd060718 100644 (file)
--- a/cinder/db/sqlalchemy/migration.py
+++ b/cinder/db/sqlalchemy/migration.py
@@ -24,7 +24,7 @@ import sqlalchemy
 
 from cinder.db.sqlalchemy.api import get_engine
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 
 INIT_VERSION = 000
 _REPOSITORY = None

diff --git a/cinder/exception.py b/cinder/exception.py
index 860f5fcf2af54d4a7dbaf693e4de6c92706c988c..fcfd4ad951c809a3ff669eb1b54b6b9da5bf845b 100644 (file)
--- a/cinder/exception.py
+++ b/cinder/exception.py
@@ -28,7 +28,7 @@ import sys
 from oslo.config import cfg
 import webob.exc
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/flow_utils.py b/cinder/flow_utils.py
index 12020fe7ab6848c2e617dd3b3f754b267abf03a0..c5816c883e6e6f4e4819476190b2d021c56d1d89 100644 (file)
--- a/cinder/flow_utils.py
+++ b/cinder/flow_utils.py
@@ -18,7 +18,7 @@ from taskflow import states
 from taskflow import task
 from taskflow.utils import misc
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/i18n.py b/cinder/i18n.py
new file mode 100644 (file)
index 0000000..d16b5c6
--- /dev/null
+++ b/cinder/i18n.py
@@ -0,0 +1,70 @@
+# Copyright 2014 IBM Corp.
+#
+# 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 .
+
+"""
+
+from oslo import i18n
+
+from cinder.openstack.common import gettextutils
+
+DOMAIN = 'cinder'
+
+_translators = i18n.TranslatorFactory(domain=DOMAIN)
+
+# 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
+
+
+def enable_lazy():
+    return i18n.enable_lazy()
+
+
+def translate(value, user_locale=None):
+    return i18n.translate(value, user_locale)
+
+
+def get_available_languages():
+    return i18n.get_available_languages(DOMAIN)
+
+
+# Parts in oslo-incubator are still using gettextutils._(), _LI(), etc., from
+# oslo-incubator. Until these parts are changed to use oslo.i18n, Cinder
+# needs to do something to allow them to work. One option is to continue to
+# initialize gettextutils, but with the way that Cinder has initialization
+# spread out over mutltiple entry points, we'll monkey-patch
+# gettextutils._(), _LI(), etc., to use our oslo.i18n versions.
+
+# FIXME(dims): Remove the monkey-patching and update openstack-common.conf and
+# do a sync with oslo-incubator to remove gettextutils once oslo-incubator
+# isn't using oslo-incubator gettextutils any more.
+
+gettextutils._ = _
+gettextutils._LI = _LI
+gettextutils._LW = _LW
+gettextutils._LE = _LE
+gettextutils._LC = _LC

diff --git a/cinder/image/glance.py b/cinder/image/glance.py
index 3f4f339ac448612d2a4c24b1ced030982870d749..d91582ec46639be1f18e51cb1b0af69f412e58e5 100644 (file)
--- a/cinder/image/glance.py
+++ b/cinder/image/glance.py
@@ -31,7 +31,7 @@ from oslo.config import cfg
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils

diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py
index 1ef9e287662937407210a0a88c3a08281fb2af47..1d51e94c78c747b9d7ac0371b96b2d1a6981f899 100644 (file)
--- a/cinder/image/image_utils.py
+++ b/cinder/image/image_utils.py
@@ -31,8 +31,8 @@ import tempfile
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import fileutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import imageutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils

diff --git a/cinder/keymgr/conf_key_mgr.py b/cinder/keymgr/conf_key_mgr.py
index 9915bfe576cc4801f4818e7fed6e0b15e468d7ee..e6ee56d1cda65278231d36679f5aeea81f95bf49 100644 (file)
--- a/cinder/keymgr/conf_key_mgr.py
+++ b/cinder/keymgr/conf_key_mgr.py
@@ -36,9 +36,9 @@ import array
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.keymgr import key
 from cinder.keymgr import key_mgr
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/policy.py b/cinder/policy.py
index 9e3999efaf796b0f93080e9f6fbeaf6f3c740615..432642c9f21fb76da39f59f44d37172dbda815a1 100644 (file)
--- a/cinder/policy.py
+++ b/cinder/policy.py
@@ -19,7 +19,7 @@
 from oslo.config import cfg
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import policy
 from cinder import utils
 

diff --git a/cinder/quota.py b/cinder/quota.py
index 472976d5b3ed3e903d2356fa0557531c8959e50f..8a234d7983df33accbc3eba5c6b6bed2e46617d4 100644 (file)
--- a/cinder/quota.py
+++ b/cinder/quota.py
@@ -24,7 +24,7 @@ from oslo.config import cfg
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils

diff --git a/cinder/quota_utils.py b/cinder/quota_utils.py
index bce6e4016ee7692794ef7f080aded32a063e7d47..da07cf81e20f7ff0a42c3d213773a04412343156 100644 (file)
--- a/cinder/quota_utils.py
+++ b/cinder/quota_utils.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import quota
 

diff --git a/cinder/scheduler/driver.py b/cinder/scheduler/driver.py
index 0ed9228dae2896ca07ceef1ae0250954020b2995..25df391de0efb458c43baf9e2a7f09d175017eb2 100644 (file)
--- a/cinder/scheduler/driver.py
+++ b/cinder/scheduler/driver.py
@@ -22,7 +22,7 @@ Scheduler base class that all Schedulers should inherit from
 from oslo.config import cfg
 
 from cinder import db
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import timeutils
 from cinder.volume import rpcapi as volume_rpcapi

diff --git a/cinder/scheduler/filter_scheduler.py b/cinder/scheduler/filter_scheduler.py
index ac496f9371a0e33df56961bc983141190d70a173..b32c4d39ff858f81e64b2375659ebe3e05b93ab9 100644 (file)
--- a/cinder/scheduler/filter_scheduler.py
+++ b/cinder/scheduler/filter_scheduler.py
@@ -23,7 +23,7 @@ Weighing Functions.
 from oslo.config import cfg
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.scheduler import driver
 from cinder.scheduler import scheduler_options

diff --git a/cinder/scheduler/filters/capacity_filter.py b/cinder/scheduler/filters/capacity_filter.py
index 1210fb3aa7cb11b9905d3b2bb5e1abcd9150483b..b7dca83ab1588c2b7f564ddf8e5b57ef8bd0028d 100644 (file)
--- a/cinder/scheduler/filters/capacity_filter.py
+++ b/cinder/scheduler/filters/capacity_filter.py
@@ -18,7 +18,7 @@
 
 import math
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.scheduler import filters
 

diff --git a/cinder/scheduler/flows/create_volume.py b/cinder/scheduler/flows/create_volume.py
index b8b04703ad2d1dd665a4ac3ee1a655217c66f3a0..43007a4edce0880ff42cc6600cef5f33d7fb202f 100644 (file)
--- a/cinder/scheduler/flows/create_volume.py
+++ b/cinder/scheduler/flows/create_volume.py
@@ -15,8 +15,8 @@ from taskflow.patterns import linear_flow
 
 from cinder import exception
 from cinder import flow_utils
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import rpc
 from cinder import utils

diff --git a/cinder/scheduler/host_manager.py b/cinder/scheduler/host_manager.py
index 0f83e963a2c18063aa99f202253dca988dd0c707..1bddeffce6280fc7c4d5238b4505617fcaef73a1 100644 (file)
--- a/cinder/scheduler/host_manager.py
+++ b/cinder/scheduler/host_manager.py
@@ -23,7 +23,7 @@ from oslo.config import cfg
 
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.scheduler import filters
 from cinder.openstack.common.scheduler import weights

diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py
index 5f872a9123d374b2af219b6df8030d0a3f53ccd5..a6993c1c5c1bb604609785cf57540d5aded7a835 100644 (file)
--- a/cinder/scheduler/manager.py
+++ b/cinder/scheduler/manager.py
@@ -26,9 +26,9 @@ from cinder import context
 from cinder import db
 from cinder import exception
 from cinder import flow_utils
+from cinder.i18n import _
 from cinder import manager
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder import quota

diff --git a/cinder/scheduler/scheduler_options.py b/cinder/scheduler/scheduler_options.py
index 0d405fdf1101411eaca0569693d884b7a75111a6..661e899eae7b3f96a0c34e374bd5df970c89ed6a 100644 (file)
--- a/cinder/scheduler/scheduler_options.py
+++ b/cinder/scheduler/scheduler_options.py
@@ -26,7 +26,7 @@ import os
 
 from oslo.config import cfg
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 

diff --git a/cinder/service.py b/cinder/service.py
index 3554f67c2a7c94d6bee3ae72fc8096b79b169745..f04022b2b213e454c53d57e72fac8257f7e3587e 100755 (executable)
--- a/cinder/service.py
+++ b/cinder/service.py
@@ -28,7 +28,7 @@ from oslo import messaging
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall

diff --git a/cinder/ssh_utils.py b/cinder/ssh_utils.py
index bbeb030db2e3d7093aa1a97f3667babebf580dbb..87831560d4ce57c4e184f6bc35aad2570dd07ebb 100644 (file)
--- a/cinder/ssh_utils.py
+++ b/cinder/ssh_utils.py
@@ -24,7 +24,7 @@ from eventlet import pools
 import paramiko
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/tests/api/contrib/test_backups.py b/cinder/tests/api/contrib/test_backups.py
index 088b15dad024ab927fb8e2783c67e83f6983f8cc..0cfd9ea2c894d1033ee6d6a2032783f582fe216a 100644 (file)
--- a/cinder/tests/api/contrib/test_backups.py
+++ b/cinder/tests/api/contrib/test_backups.py
@@ -28,7 +28,7 @@ import cinder.backup
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder import test

diff --git a/cinder/tests/api/middleware/test_faults.py b/cinder/tests/api/middleware/test_faults.py
index 83100feca355aa0c233750e1996b32b2afabadce..5f9eb75e269d611a38a4f1096d3ed4052461ae6f 100644 (file)
--- a/cinder/tests/api/middleware/test_faults.py
+++ b/cinder/tests/api/middleware/test_faults.py
@@ -17,13 +17,15 @@ from xml.dom import minidom
 
 import gettext
 import mock
+from oslo.i18n import _lazy
 import webob.dec
 import webob.exc
 
 from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder import exception
-from cinder.openstack.common import gettextutils
+from cinder import i18n as cinder_i18n
+from cinder.i18n import _
 from cinder.openstack.common import jsonutils
 from cinder import test
 
@@ -31,6 +33,15 @@ from cinder import test
 class TestFaults(test.TestCase):
     """Tests covering `cinder.api.openstack.faults:Fault` class."""
 
+    def setUp(self):
+        super(TestFaults, self).setUp()
+        back_use_lazy = _lazy.USE_LAZY
+        cinder_i18n.enable_lazy()
+        self.addCleanup(self._restore_use_lazy, back_use_lazy)
+
+    def _restore_use_lazy(self, back_use_lazy):
+        _lazy.USE_LAZY = back_use_lazy
+
     def _prepare_xml(self, xml_string):
         """Remove characters from string which hinder XML equality testing."""
         xml_string = xml_string.replace("  ", "")
@@ -110,15 +121,15 @@ class TestFaults(test.TestCase):
         self.assertNotIn('resizeNotAllowed', resp.body)
         self.assertIn('forbidden', resp.body)
 
-    def test_raise_http_with_localized_explanation(self):
+    @mock.patch('cinder.api.openstack.wsgi.i18n.translate')
+    def test_raise_http_with_localized_explanation(self, mock_translate):
         params = ('blah', )
-        expl = gettextutils.Message("String with params: %s" % params, 'test')
+        expl = _("String with params: %s") % params
 
         def _mock_translation(msg, locale):
             return "Mensaje traducido"
 
-        self.stubs.Set(gettextutils,
-                       "translate", _mock_translation)
+        mock_translate.side_effect = _mock_translation
 
         @webob.dec.wsgify
         def raiser(req):
@@ -131,10 +142,10 @@ class TestFaults(test.TestCase):
         self.assertIn(("Mensaje traducido"), resp.body)
         self.stubs.UnsetAll()
 
-    @mock.patch('cinder.openstack.common.gettextutils.gettext.translation')
+    @mock.patch('oslo.i18n._message.gettext.translation')
     def test_raise_invalid_with_localized_explanation(self, mock_translation):
-        msg_template = gettextutils.Message("Invalid input: %(reason)s", "")
-        reason = gettextutils.Message("Value is invalid", "")
+        msg_template = _("Invalid input: %(reason)s")
+        reason = _("Value is invalid")
 
         class MockESTranslations(gettext.GNUTranslations):
             def ugettext(self, msgid):
@@ -144,6 +155,9 @@ class TestFaults(test.TestCase):
                     return "El valor es invalido"
                 return msgid
 
+            def gettext(self, msgid):
+                return self.ugettext(msgid)
+
         def translation(domain, localedir=None, languages=None, fallback=None):
             return MockESTranslations()
 

diff --git a/cinder/tests/brick/test_brick_connector.py b/cinder/tests/brick/test_brick_connector.py
index 53289c85f5ea2827e45c553b37cca33922ba206f..f2ff6caa11087cd7cd7d9022f1ba0b2bc0362c16 100644 (file)
--- a/cinder/tests/brick/test_brick_connector.py
+++ b/cinder/tests/brick/test_brick_connector.py
@@ -19,7 +19,7 @@ import time
 from cinder.brick import exception
 from cinder.brick.initiator import connector
 from cinder.brick.initiator import host_driver
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 from cinder.openstack.common import processutils as putils

diff --git a/cinder/tests/brick/test_brick_remotefs.py b/cinder/tests/brick/test_brick_remotefs.py
index f152af716e9c8d69ae09f1e2862fc3c046b6b141..9af722a560d52cbb50386ba5ffd92b3930ceb61d 100644 (file)
--- a/cinder/tests/brick/test_brick_remotefs.py
+++ b/cinder/tests/brick/test_brick_remotefs.py
@@ -18,7 +18,7 @@ import mox
 
 from cinder.brick import exception
 from cinder.brick.remotefs import remotefs
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import test
 

diff --git a/cinder/tests/fake_driver.py b/cinder/tests/fake_driver.py
index e51d27f43975ac23a1aed177c1a20bfd49050a1b..aaa961798d0bed84f7634fafad475f1093d0555f 100644 (file)
--- a/cinder/tests/fake_driver.py
+++ b/cinder/tests/fake_driver.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.tests.brick.fake_lvm import FakeBrickLVM
 from cinder.volume import driver

diff --git a/cinder/tests/integrated/api/client.py b/cinder/tests/integrated/api/client.py
index b50b3a10125ea3fe0cbb1710e5efc66d87bd255b..eeb599ef52a8c593ed1c169e3bf7f7c56f028a72 100644 (file)
--- a/cinder/tests/integrated/api/client.py
+++ b/cinder/tests/integrated/api/client.py
@@ -17,7 +17,7 @@ import requests
 
 import six.moves.urllib.parse as urlparse
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 

diff --git a/cinder/tests/test_backup_ceph.py b/cinder/tests/test_backup_ceph.py
index 26aeede56307855803bc17b31442b8eb7d29f5f3..fb905ebee138bdaf082403c90ee7ca3c93c20334 100644 (file)
--- a/cinder/tests/test_backup_ceph.py
+++ b/cinder/tests/test_backup_ceph.py
@@ -27,7 +27,7 @@ from cinder.backup.drivers import ceph
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils

diff --git a/cinder/tests/test_backup_swift.py b/cinder/tests/test_backup_swift.py
index dfc21b32ae066952b73af6880b45eb0886ccc331..4a0834a7d3b9a1b06dbea49ac7d10d0b2a2eed94 100644 (file)
--- a/cinder/tests/test_backup_swift.py
+++ b/cinder/tests/test_backup_swift.py
@@ -29,7 +29,7 @@ from cinder.backup.drivers.swift import SwiftBackupDriver
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import test
 from cinder.tests.backup.fake_swift_client import FakeSwiftClient

diff --git a/cinder/tests/test_glusterfs.py b/cinder/tests/test_glusterfs.py
index 3ed220b05b39628aaa5c3f2d5da676ad84557dbb..c81e48f8ffa48ba37ede99ec9d7352ad52ac0bd1 100644 (file)
--- a/cinder/tests/test_glusterfs.py
+++ b/cinder/tests/test_glusterfs.py
@@ -33,8 +33,8 @@ from cinder import compute
 from cinder import context
 from cinder import db
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import imageutils
 from cinder.openstack.common import processutils as putils
 from cinder.openstack.common import units

diff --git a/cinder/tests/test_ibm_xiv_ds8k.py b/cinder/tests/test_ibm_xiv_ds8k.py
index e6bd12ab5b4e7cf037d4e47076e1711222ec8c5f..3d0995b62829f48ce31a640d47d8a201939f426d 100644 (file)
--- a/cinder/tests/test_ibm_xiv_ds8k.py
+++ b/cinder/tests/test_ibm_xiv_ds8k.py
@@ -23,7 +23,7 @@ import mox
 from oslo.config import cfg
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder import test
 from cinder.volume import configuration as conf
 from cinder.volume.drivers.ibm import xiv_ds8k

diff --git a/cinder/tests/test_misc.py b/cinder/tests/test_misc.py
index 4c7815745590dd1a2ad587ec908bed847ddf64b9..8458bf5b6a7c601290cc87fd8b415f7eee600a9f 100644 (file)
--- a/cinder/tests/test_misc.py
+++ b/cinder/tests/test_misc.py
@@ -18,7 +18,7 @@ import os
 
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder import test
 
 

diff --git a/cinder/tests/test_netapp.py b/cinder/tests/test_netapp.py
index 652e66df7b6ea2112613065c55a4cf53d7e76a19..f8c7d4eb7cbbde93c8161f99bb3e72a2f2657d39 100644 (file)
--- a/cinder/tests/test_netapp.py
+++ b/cinder/tests/test_netapp.py
@@ -25,7 +25,7 @@ from lxml import etree
 import six
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import test
 from cinder.volume import configuration as conf

diff --git a/cinder/tests/test_netapp_nfs.py b/cinder/tests/test_netapp_nfs.py
index dbe6c6d746d905ac87a82461ff697c7237d31366..15a4067e649f1027bd2b145cd5946bf3c3b41cb3 100644 (file)
--- a/cinder/tests/test_netapp_nfs.py
+++ b/cinder/tests/test_netapp_nfs.py
@@ -24,8 +24,8 @@ import os
 
 from cinder import context
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import test
 from cinder.volume import configuration as conf

diff --git a/cinder/tests/test_rbd.py b/cinder/tests/test_rbd.py
index 6d8902a1d20286fc38f9ab0a9f2d287de5e6e23b..10f447c92d47a562647032cf3cd48fc221bc573c 100644 (file)
--- a/cinder/tests/test_rbd.py
+++ b/cinder/tests/test_rbd.py
@@ -23,8 +23,8 @@ import tempfile
 
 from cinder import db
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import units

diff --git a/cinder/tests/test_storwize_svc.py b/cinder/tests/test_storwize_svc.py
index 0f44e73bf6e88d2064c255f430569d92dc710113..4b26d515af12aaaed36612a375d8771575a302a3 100644 (file)
--- a/cinder/tests/test_storwize_svc.py
+++ b/cinder/tests/test_storwize_svc.py
@@ -25,8 +25,8 @@ import time
 
 from cinder import context
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils

diff --git a/cinder/tests/test_volume_types.py b/cinder/tests/test_volume_types.py
index 79ffd338f0cc4230d5f6993b27c8bb7cecfd7c9c..0ca7781c599d9ed2632967e6f5d2978cff737011 100644 (file)
--- a/cinder/tests/test_volume_types.py
+++ b/cinder/tests/test_volume_types.py
@@ -24,7 +24,7 @@ from cinder import db
 from cinder.db.sqlalchemy import api as db_api
 from cinder.db.sqlalchemy import models
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import test
 from cinder.tests import conf_fixture

diff --git a/cinder/tests/test_wsgi.py b/cinder/tests/test_wsgi.py
index 323347c4cc599f9bddb5309b99be4078920e8faf..214e5c5566c0d6a1ea69c6a6bc05ccbb3e1abea8 100644 (file)
--- a/cinder/tests/test_wsgi.py
+++ b/cinder/tests/test_wsgi.py
@@ -22,12 +22,14 @@ import tempfile
 import urllib2
 
 from oslo.config import cfg
+from oslo.i18n import _lazy
 import testtools
 import webob
 import webob.dec
 
 from cinder import exception
-from cinder.openstack.common import gettextutils
+from cinder import i18n
+from cinder.i18n import _
 from cinder import test
 import cinder.wsgi
 
@@ -200,14 +202,21 @@ class TestWSGIServer(test.TestCase):
 
 class ExceptionTest(test.TestCase):
 
+    def setUp(self):
+        super(ExceptionTest, self).setUp()
+        back_use_lazy = _lazy.USE_LAZY
+        i18n.enable_lazy()
+        self.addCleanup(self._restore_use_lazy, back_use_lazy)
+
+    def _restore_use_lazy(self, back_use_lazy):
+        _lazy.USE_LAZY = back_use_lazy
+
     def _wsgi_app(self, inner_app):
         # NOTE(luisg): In order to test localization, we need to
         # make sure the lazy _() is installed in the 'fault' module
         # also we don't want to install the _() system-wide and
         # potentially break other test cases, so we do it here for this
         # test suite only.
-        gettextutils.install('')
-        gettextutils.enable_lazy()
         from cinder.api.middleware import fault
         return fault.FaultWrapper(inner_app)
 
@@ -278,11 +287,11 @@ class ExceptionTest(test.TestCase):
         resp = webob.Request.blank('/').get_response(api)
         self.assertEqual(500, resp.status_int)
 
-    @mock.patch('cinder.openstack.common.gettextutils.translate')
+    @mock.patch('cinder.i18n.translate')
     def test_cinder_exception_with_localized_explanation(self, mock_t9n):
         msg = 'My Not Found'
         msg_translation = 'Mi No Encontrado'
-        message = gettextutils.Message(msg, '')
+        message = _(msg)  # noqa
 
         @webob.dec.wsgify
         def fail(req):
@@ -305,9 +314,7 @@ class ExceptionTest(test.TestCase):
 
         # Test response with localization
         def mock_translate(msgid, locale):
-            if isinstance(msgid, gettextutils.Message):
-                return msg_translation
-            return msgid
+            return msg_translation
 
         mock_t9n.side_effect = mock_translate
 

diff --git a/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py b/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py
index 05b8d7927e725409fc818f6917ed8ef65b6eecbc..810ca76cef2b2d0314efef1bcfed7eab4b3ff1f5 100644 (file)
--- a/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py
+++ b/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py
@@ -25,7 +25,7 @@ import paramiko
 from oslo.config import cfg
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder import test

diff --git a/cinder/transfer/api.py b/cinder/transfer/api.py
index 07099e97a08373ce739f064a1ea5b6c070c4ba7a..da1c1e26907f451294d0601550c0892f0d8867ba 100644 (file)
--- a/cinder/transfer/api.py
+++ b/cinder/transfer/api.py
@@ -26,8 +26,8 @@ from oslo.config import cfg
 
 from cinder.db import base
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import quota
 from cinder.volume import api as volume_api

diff --git a/cinder/utils.py b/cinder/utils.py
index 72f6749266b66288af464a344f7f2a5ffbe83a84..bdc9d92c99342f567dc56ac2c58fa74b1bf374d0 100644 (file)
--- a/cinder/utils.py
+++ b/cinder/utils.py
@@ -40,7 +40,7 @@ from xml.sax import saxutils
 
 from cinder.brick.initiator import connector
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index 89355772e5f909bdc726d6edce931b2eceb36a98..f91161ef5651e03d196739270c3a05e7079c63b8 100644 (file)
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -29,10 +29,10 @@ from cinder import context
 from cinder.db import base
 from cinder import exception
 from cinder import flow_utils
+from cinder.i18n import _
 from cinder.image import glance
 from cinder import keymgr
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import uuidutils

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index 20d290bc0ad95167fd3c170ea116e89931a4ad86..bd1c4ef1ac5d7cd7563130a5abdd2b82f115af14 100644 (file)
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -22,10 +22,10 @@ import time
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
 from cinder.openstack.common import excutils
 from cinder.openstack.common import fileutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder import utils

diff --git a/cinder/volume/drivers/block_device.py b/cinder/volume/drivers/block_device.py
index 5f217f74d40c89464ba6f03c90ce71582357beba..35e16bfbf35a62802c2f77fc6d9aa750091b342f 100644 (file)
--- a/cinder/volume/drivers/block_device.py
+++ b/cinder/volume/drivers/block_device.py
@@ -20,8 +20,8 @@ from oslo.config import cfg
 from cinder import context
 from cinder.db.sqlalchemy import api
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume import utils as volutils

diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py
index c05bbbf849cf484866f8e1a53c56ed9cc7a631ed..d97b21000394c0f662a69c1ef2a121ad02a66be6 100644 (file)
--- a/cinder/volume/drivers/coraid.py
+++ b/cinder/volume/drivers/coraid.py
@@ -30,7 +30,7 @@ from oslo.config import cfg
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/drivers/emc/emc_smis_common.py b/cinder/volume/drivers/emc/emc_smis_common.py
index f3ff96a061c41c9efafcb7d2d139f3eda72a4bdd..d4a2f9f159dde832d45613c34af06f6c9a555935 100644 (file)
--- a/cinder/volume/drivers/emc/emc_smis_common.py
+++ b/cinder/volume/drivers/emc/emc_smis_common.py
@@ -26,7 +26,7 @@ from oslo.config import cfg
 from xml.dom.minidom import parseString
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder.volume import volume_types

diff --git a/cinder/volume/drivers/emc/emc_smis_iscsi.py b/cinder/volume/drivers/emc/emc_smis_iscsi.py
index 60ab3f2a50de72b0a0d42aa7f4bad4b82bcadae7..18cb350055847d31d6b61e55699a78afbd8ceba5 100644 (file)
--- a/cinder/volume/drivers/emc/emc_smis_iscsi.py
+++ b/cinder/volume/drivers/emc/emc_smis_iscsi.py
@@ -20,7 +20,7 @@ ISCSI Drivers for EMC VNX and VMAX arrays based on SMI-S.
 
 from cinder import context
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume.drivers.emc import emc_smis_common

diff --git a/cinder/volume/drivers/emc/emc_vnx_cli.py b/cinder/volume/drivers/emc/emc_vnx_cli.py
index 9324c6e00996b2bf1405181b0f65e78407445545..8f7886b1674d22ba0e60700d071b190bfe47b3a3 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vnx_cli.py
+++ b/cinder/volume/drivers/emc/emc_vnx_cli.py
@@ -25,8 +25,8 @@ from oslo.config import cfg
 
 from cinder import exception
 from cinder.exception import EMCVnxCLICmdError
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import jsonutils as json
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/drivers/eqlx.py b/cinder/volume/drivers/eqlx.py
index 1030bc8f29ba482c04a0b766547dff5c4e40b29d..9a583cffb51525376c790cb41d8736069eb503da 100644 (file)
--- a/cinder/volume/drivers/eqlx.py
+++ b/cinder/volume/drivers/eqlx.py
@@ -24,8 +24,8 @@ import greenlet
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder import ssh_utils

diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py
index 0345d0546906752fe84d186daee5f0145ec686ef..13f30f73d8774798f93de1eb8807d909ce890f12 100644 (file)
--- a/cinder/volume/drivers/glusterfs.py
+++ b/cinder/volume/drivers/glusterfs.py
@@ -27,9 +27,9 @@ from cinder.brick.remotefs import remotefs
 from cinder import compute
 from cinder import db
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
 from cinder.openstack.common import fileutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/hds/hds.py b/cinder/volume/drivers/hds/hds.py
index 136a2df801e8628b432a6c095f72911f24dca462..57f7b618b84a2e486eca31e7a382d18790cbd8b4 100644 (file)
--- a/cinder/volume/drivers/hds/hds.py
+++ b/cinder/volume/drivers/hds/hds.py
@@ -23,8 +23,8 @@ from oslo.config import cfg
 from xml.etree import ElementTree as ETree
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import driver

diff --git a/cinder/volume/drivers/hds/iscsi.py b/cinder/volume/drivers/hds/iscsi.py
index 7685fc7294f80a17e25bd0df79853850cf694024..fd287ac97ee0794923e7f167605101eaeb325d93 100644 (file)
--- a/cinder/volume/drivers/hds/iscsi.py
+++ b/cinder/volume/drivers/hds/iscsi.py
@@ -22,8 +22,8 @@ from oslo.config import cfg
 from xml.etree import ElementTree as ETree
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder.volume import driver

diff --git a/cinder/volume/drivers/hds/nfs.py b/cinder/volume/drivers/hds/nfs.py
index dbfa17054b9ea5d3784650352ce9e35142f076c7..c93ddfdcdcaa00c62d9777896878f7e183204583 100644 (file)
--- a/cinder/volume/drivers/hds/nfs.py
+++ b/cinder/volume/drivers/hds/nfs.py
@@ -24,9 +24,9 @@ from oslo.config import cfg
 from xml.etree import ElementTree as ETree
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/huawei/__init__.py b/cinder/volume/drivers/huawei/__init__.py
index c9ca0798a1a9a7671dfdbd45aee874ae6f9b68eb..3fca8eed4bdb8e73b1f421147cb71870b6c8c5db 100644 (file)
--- a/cinder/volume/drivers/huawei/__init__.py
+++ b/cinder/volume/drivers/huawei/__init__.py
@@ -22,7 +22,7 @@ The product type and the protocol should be specified in config file before.
 from oslo.config import cfg
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.huawei import huawei_dorado
 from cinder.volume.drivers.huawei import huawei_hvs

diff --git a/cinder/volume/drivers/huawei/huawei_t.py b/cinder/volume/drivers/huawei/huawei_t.py
index 280599d432b44993a1c2644b57a91601750d2bc1..fd960a553596344156e513a24b924103418b6037 100644 (file)
--- a/cinder/volume/drivers/huawei/huawei_t.py
+++ b/cinder/volume/drivers/huawei/huawei_t.py
@@ -21,7 +21,7 @@ import re
 import time
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume.drivers.huawei import huawei_utils

diff --git a/cinder/volume/drivers/huawei/huawei_utils.py b/cinder/volume/drivers/huawei/huawei_utils.py
index 148eca589e20cb315838b09ff6e99c41f6e4305c..9c6b9e5cf66f012c9dd07983766a9e80f9b23f19 100644 (file)
--- a/cinder/volume/drivers/huawei/huawei_utils.py
+++ b/cinder/volume/drivers/huawei/huawei_utils.py
@@ -16,7 +16,7 @@
 
 from xml.etree import ElementTree as ET
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/volume/drivers/huawei/rest_common.py b/cinder/volume/drivers/huawei/rest_common.py
index de6fabbcac8be81513520f7bdd001e13b473a243..262a9321cc149314842d5d4e0a336c15deea0bd2 100644 (file)
--- a/cinder/volume/drivers/huawei/rest_common.py
+++ b/cinder/volume/drivers/huawei/rest_common.py
@@ -26,8 +26,8 @@ from xml.etree import ElementTree as ET
 
 from cinder import context
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder import utils

diff --git a/cinder/volume/drivers/huawei/ssh_common.py b/cinder/volume/drivers/huawei/ssh_common.py
index c9fe1e82077baaadc1e8b0d55f14c6210d3b744a..a40ac3f84176e36a5c98c190ce6bd29b50c5acbb 100644 (file)
--- a/cinder/volume/drivers/huawei/ssh_common.py
+++ b/cinder/volume/drivers/huawei/ssh_common.py
@@ -29,8 +29,8 @@ from xml.etree import ElementTree as ET
 
 from cinder import context
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import ssh_utils
 from cinder import utils

diff --git a/cinder/volume/drivers/ibm/gpfs.py b/cinder/volume/drivers/ibm/gpfs.py
index ea2308f7d6bac11735cea98afb832583df7d5ddb..160caf41755304e9afeb06f337992c1eb371794c 100644 (file)
--- a/cinder/volume/drivers/ibm/gpfs.py
+++ b/cinder/volume/drivers/ibm/gpfs.py
@@ -24,9 +24,9 @@ import shutil
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
 from cinder.openstack.common import fileutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/ibm/ibmnas.py b/cinder/volume/drivers/ibm/ibmnas.py
index d1313ee0f9c5369c4835ddb7f550342dc283d559..9bf1ae73e8aa97fa413111949df77ac45b808d5d 100644 (file)
--- a/cinder/volume/drivers/ibm/ibmnas.py
+++ b/cinder/volume/drivers/ibm/ibmnas.py
@@ -33,8 +33,8 @@ import re
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/ibm/storwize_svc/__init__.py b/cinder/volume/drivers/ibm/storwize_svc/__init__.py
index a9591bff9a26df1d4701af0e43dc53f9a039c983..f63856ebf1a9f9c97c6e0d3d82843035aa3fb9b6 100644 (file)
--- a/cinder/volume/drivers/ibm/storwize_svc/__init__.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/__init__.py
@@ -41,8 +41,8 @@ from oslo.config import cfg
 
 from cinder import context
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/ibm/storwize_svc/helpers.py b/cinder/volume/drivers/ibm/storwize_svc/helpers.py
index a762c2fc009f3cd0f9a1bca721662776e5d806c6..127dfcfb7d077e299bd6641bb88b9ad040ad6da6 100644 (file)
--- a/cinder/volume/drivers/ibm/storwize_svc/helpers.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/helpers.py
@@ -23,8 +23,8 @@ from eventlet import greenthread
 
 from cinder import context
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 from cinder.openstack.common import strutils

diff --git a/cinder/volume/drivers/ibm/storwize_svc/ssh.py b/cinder/volume/drivers/ibm/storwize_svc/ssh.py
index 5ca7ad9aca28743bb29eb5edb7ab49064841647e..8b3876a96302100d97df2c457fcf08faa5db988b 100644 (file)
--- a/cinder/volume/drivers/ibm/storwize_svc/ssh.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/ssh.py
@@ -17,7 +17,7 @@
 import re
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 

diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py
index f984a506c4786b0fc0b5afd95292facca00bd15d..bfc2a927440754b65f8230cc9794e782e87dc9f5 100644 (file)
--- a/cinder/volume/drivers/lvm.py
+++ b/cinder/volume/drivers/lvm.py
@@ -27,9 +27,9 @@ from oslo.config import cfg
 from cinder.brick import exception as brick_exception
 from cinder.brick.local_dev import lvm as lvm
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
 from cinder.openstack.common import fileutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/netapp/api.py b/cinder/volume/drivers/netapp/api.py
index b04df272d1cc7e923dda7ad20f1d87c5c05798ef..35ac582e597f9f8674e04b6fed7ff32dd1c63d14 100644 (file)
--- a/cinder/volume/drivers/netapp/api.py
+++ b/cinder/volume/drivers/netapp/api.py
@@ -22,7 +22,7 @@ Contains classes required to issue api calls to ONTAP and OnCommand DFM.
 from lxml import etree
 import urllib2
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/volume/drivers/netapp/common.py b/cinder/volume/drivers/netapp/common.py
index 17365039426cf0088952b9046b686ffe17137a6c..d2e04804bdcefdd8ca39c01ed479977ec03b88d8 100644 (file)
--- a/cinder/volume/drivers/netapp/common.py
+++ b/cinder/volume/drivers/netapp/common.py
@@ -20,7 +20,7 @@ Supports call to multiple storage systems of different families and protocols.
 """
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.volume import driver

diff --git a/cinder/volume/drivers/netapp/eseries/client.py b/cinder/volume/drivers/netapp/eseries/client.py
index b192b7189ebee97f97deaaf1941ac65c1a3f85ff..112fb423be7f8d1fed164caf2d558241b580211e 100644 (file)
--- a/cinder/volume/drivers/netapp/eseries/client.py
+++ b/cinder/volume/drivers/netapp/eseries/client.py
@@ -22,7 +22,7 @@ import requests
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/volume/drivers/netapp/eseries/iscsi.py b/cinder/volume/drivers/netapp/eseries/iscsi.py
index 39181cf28005539d5d6645a58954a9c58b0530b0..0d476f5e32ef425e31d9a59a8933346c00b6b470 100644 (file)
--- a/cinder/volume/drivers/netapp/eseries/iscsi.py
+++ b/cinder/volume/drivers/netapp/eseries/iscsi.py
@@ -23,8 +23,8 @@ import uuid
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder import utils as cinder_utils

diff --git a/cinder/volume/drivers/netapp/iscsi.py b/cinder/volume/drivers/netapp/iscsi.py
index 630b87b8dc1f3db8be58699e3ea37bf6abdc79c3..cc8e8e03e74a448d477543f35c32ea9a63e273fa 100644 (file)
--- a/cinder/volume/drivers/netapp/iscsi.py
+++ b/cinder/volume/drivers/netapp/iscsi.py
@@ -27,8 +27,8 @@ import time
 import uuid
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/netapp/nfs.py b/cinder/volume/drivers/netapp/nfs.py
index 8899a7c2f52ed2efd7cae75e82f418ad4ad7be07..1a16415caa5afa7eede73dabfd5c22ab8a3d9a21 100644 (file)
--- a/cinder/volume/drivers/netapp/nfs.py
+++ b/cinder/volume/drivers/netapp/nfs.py
@@ -26,9 +26,9 @@ import uuid
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/netapp/ssc_utils.py b/cinder/volume/drivers/netapp/ssc_utils.py
index aee4244e5c988630f091087bd9c2a52caac068e3..c6daa5bbbb7d168735f27b30132722825a64355a 100644 (file)
--- a/cinder/volume/drivers/netapp/ssc_utils.py
+++ b/cinder/volume/drivers/netapp/ssc_utils.py
@@ -21,7 +21,7 @@ import copy
 from threading import Timer
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder import utils

diff --git a/cinder/volume/drivers/netapp/utils.py b/cinder/volume/drivers/netapp/utils.py
index 54acc2334e94fe07b20badcf4d80e8df2c3affba..eda599ea91a516126da7bfe086c78f5b7123f66c 100644 (file)
--- a/cinder/volume/drivers/netapp/utils.py
+++ b/cinder/volume/drivers/netapp/utils.py
@@ -28,7 +28,7 @@ import uuid
 
 from cinder import context
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder import utils

diff --git a/cinder/volume/drivers/nexenta/iscsi.py b/cinder/volume/drivers/nexenta/iscsi.py
index db35583adafa3f04f721f83f773abe1d64fae58f..7bd9f5c90f500b986889a0b4dd7fa00143063de6 100644 (file)
--- a/cinder/volume/drivers/nexenta/iscsi.py
+++ b/cinder/volume/drivers/nexenta/iscsi.py
@@ -23,7 +23,7 @@
 """
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume.drivers import nexenta

diff --git a/cinder/volume/drivers/nexenta/jsonrpc.py b/cinder/volume/drivers/nexenta/jsonrpc.py
index 22248df032637beeb2e5fe31d2b75e85a6a68e9e..0cb654434911454b606c409b3cb42e77afc9cb28 100644 (file)
--- a/cinder/volume/drivers/nexenta/jsonrpc.py
+++ b/cinder/volume/drivers/nexenta/jsonrpc.py
@@ -23,7 +23,7 @@
 
 import urllib2
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers import nexenta

diff --git a/cinder/volume/drivers/nexenta/nfs.py b/cinder/volume/drivers/nexenta/nfs.py
index 168d0169c5690f6b4cda5a2a5f8f7b71703382ed..a5562ad26d8d8d39f2dc06daf263a3d49d21e999 100644 (file)
--- a/cinder/volume/drivers/nexenta/nfs.py
+++ b/cinder/volume/drivers/nexenta/nfs.py
@@ -28,7 +28,7 @@ import re
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder.volume.drivers import nexenta

diff --git a/cinder/volume/drivers/nexenta/utils.py b/cinder/volume/drivers/nexenta/utils.py
index 9b92421ed363ed01788ee0f68c37e711e0f2a5dd..55f040970fd37162bfeff24214cc17cd90853631 100644 (file)
--- a/cinder/volume/drivers/nexenta/utils.py
+++ b/cinder/volume/drivers/nexenta/utils.py
@@ -25,7 +25,7 @@ import re
 
 import six.moves.urllib.parse as urlparse
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import units
 
 

diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
index 9c519aede0550a8a3d4e1b9f3528dbe416f4e587..123b0e23f4fb7acc170c49b355447cc2d945aa1a 100644 (file)
--- a/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -21,8 +21,8 @@ from oslo.config import cfg
 
 from cinder.brick.remotefs import remotefs
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils as putils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/nimble.py b/cinder/volume/drivers/nimble.py
index 255a54eb3ec371b84badee24da5c68d8c7605fc4..d9bf96dc79054ff89112c25b4a29f24ec31b0944 100644 (file)
--- a/cinder/volume/drivers/nimble.py
+++ b/cinder/volume/drivers/nimble.py
@@ -28,7 +28,7 @@ from oslo.config import cfg
 from suds import client
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder.volume.drivers.san.san import SanISCSIDriver

diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py
index 686b0bf02c1f2ac8dddec30380150544f36a11d4..0c05254269a64a1235e9da21de545e451e116b68 100644 (file)
--- a/cinder/volume/drivers/pure.py
+++ b/cinder/volume/drivers/pure.py
@@ -25,8 +25,8 @@ import urllib2
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py
index 827675c1241e6513d0ab26dd4a16ec2f9bbf4c8e..eb868bc27caee63282b1fe626d73c5d33f5a4646 100644 (file)
--- a/cinder/volume/drivers/rbd.py
+++ b/cinder/volume/drivers/rbd.py
@@ -24,9 +24,9 @@ import urllib
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
 from cinder.openstack.common import fileutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py
index 6f3931464c7543fac8f7d13730f2ed075842a31e..e4a5bcb87fcd5c512cc7517cd59f2b9647000346 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_common.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_common.py
@@ -53,8 +53,8 @@ from oslo.config import cfg
 from cinder import context
 from cinder import exception
 from cinder import flow_utils
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/san/hp/hp_3par_fc.py b/cinder/volume/drivers/san/hp/hp_3par_fc.py
index ffa9ca80f66fbb741419611748893346667575ec..6bc6e746a3b8d440daa2b77e478f2bc155b046f2 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_fc.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_fc.py
@@ -34,7 +34,7 @@ try:
 except ImportError:
     hpexceptions = None
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 import cinder.volume.driver

diff --git a/cinder/volume/drivers/san/hp/hp_3par_iscsi.py b/cinder/volume/drivers/san/hp/hp_3par_iscsi.py
index e8374814d2b347c7dadcdd430935c13935258aa9..9d3c3e31fb1c7b523bafb42904859ff121634406 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_iscsi.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_iscsi.py
@@ -35,7 +35,7 @@ except ImportError:
     hpexceptions = None
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 import cinder.volume.driver

diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py b/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
index 5127204d601552ddcda0e63da50eccdc16a8667c..420362a0eab0cb75d394ce0bb00201caaaf3f594 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
+++ b/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
@@ -23,7 +23,7 @@ operations on the SAN.
 from lxml import etree
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py b/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py
index 43d8d8b04641b7f8836085b30e98fffceb1467fb..a4671a828af94ce0549a8a57abe4251111b8c738 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py
+++ b/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py
@@ -32,7 +32,7 @@ hplefthand_password for credentials to talk to the REST service on the
 LeftHand array.
 """
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume.driver import VolumeDriver

diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py b/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py
index 9486711b6966a017cd281374b3aca55f8ecae2b9..170bb9becab0e4bb06ed2f8e9b37facc58dedec5 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py
+++ b/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py
@@ -17,7 +17,7 @@
 
 from cinder import context
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder.volume.driver import ISCSIDriver

diff --git a/cinder/volume/drivers/san/hp/hp_msa_common.py b/cinder/volume/drivers/san/hp/hp_msa_common.py
index 1e2ab7a8265dfe51df6dbbd36ac4f3c29c4636ed..b10739bc1feb6a4e7c854dd5be7e7edeed9f4362 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_msa_common.py
+++ b/cinder/volume/drivers/san/hp/hp_msa_common.py
@@ -22,7 +22,7 @@ import uuid
 from oslo.config import cfg
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.san.hp import hp_msa_client as msa
 

diff --git a/cinder/volume/drivers/san/san.py b/cinder/volume/drivers/san/san.py
index a6436150811eaf21e54a341e03610f399eb29898..81f66df30dea993b2302f624c343dfb33112508b 100644 (file)
--- a/cinder/volume/drivers/san/san.py
+++ b/cinder/volume/drivers/san/san.py
@@ -25,8 +25,8 @@ from eventlet import greenthread
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder import ssh_utils

diff --git a/cinder/volume/drivers/san/solaris.py b/cinder/volume/drivers/san/solaris.py
index 63d5cd43891d8798730548adedd955704bc76290..74ef541cd1eff8b038a3aefadaf3732b13e6f33c 100644 (file)
--- a/cinder/volume/drivers/san/solaris.py
+++ b/cinder/volume/drivers/san/solaris.py
@@ -15,7 +15,7 @@
 from oslo.config import cfg
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.san.san import SanISCSIDriver
 

diff --git a/cinder/volume/drivers/scality.py b/cinder/volume/drivers/scality.py
index c92ff4322fb16918ac8b0fcf13c69a8f30d2226c..6b9182f42d9a8eb773c4e2dfab832d27951cc612 100644 (file)
--- a/cinder/volume/drivers/scality.py
+++ b/cinder/volume/drivers/scality.py
@@ -25,8 +25,8 @@ from oslo.config import cfg
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder.volume import driver

diff --git a/cinder/volume/drivers/sheepdog.py b/cinder/volume/drivers/sheepdog.py
index 30993e55c9114d61ffcb45a1685e64e16d3699de..e05796ee5b4132e1af757bfc20baf08d190d5e93 100644 (file)
--- a/cinder/volume/drivers/sheepdog.py
+++ b/cinder/volume/drivers/sheepdog.py
@@ -25,8 +25,8 @@ import tempfile
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.image import image_utils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py
index ed21ddf882ffcb3ae4cf82218fca7bbc0137e954..a6e90d25078c7dce0c272a21f8f64e697659770e 100644 (file)
--- a/cinder/volume/drivers/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -26,7 +26,7 @@ from oslo.config import cfg
 
 from cinder import context
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/vmware/api.py b/cinder/volume/drivers/vmware/api.py
index b2ce28f480da2b57a1078fa023d1053874ef0371..40901f6b4fbda66cba5decc3ef45fda09a2f0c1d 100644 (file)
--- a/cinder/volume/drivers/vmware/api.py
+++ b/cinder/volume/drivers/vmware/api.py
@@ -18,7 +18,7 @@ Session and API call management for VMware ESX/VC server.
 Provides abstraction over cinder.volume.drivers.vmware.vim.Vim SOAP calls.
 """
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 from cinder.volume.drivers.vmware import error_util

diff --git a/cinder/volume/drivers/vmware/error_util.py b/cinder/volume/drivers/vmware/error_util.py
index fa65b47d0fdd3f45715271507a50bcd60ea1e43a..cce8cfd7686c6dab1dfbd533460ff844240ef247 100644 (file)
--- a/cinder/volume/drivers/vmware/error_util.py
+++ b/cinder/volume/drivers/vmware/error_util.py
@@ -18,7 +18,7 @@ Exception classes and SOAP response error checking module.
 """
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 
 NOT_AUTHENTICATED = 'NotAuthenticated'
 

diff --git a/cinder/volume/drivers/vmware/io_util.py b/cinder/volume/drivers/vmware/io_util.py
index 08dbd229127f9e38da0f4666e7195a7762122b37..514f45fe2015fa35a8cb325e9f39da1eca9d6bc9 100644 (file)
--- a/cinder/volume/drivers/vmware/io_util.py
+++ b/cinder/volume/drivers/vmware/io_util.py
@@ -25,7 +25,7 @@ from eventlet import greenthread
 from eventlet import queue
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/volume/drivers/vmware/read_write_util.py b/cinder/volume/drivers/vmware/read_write_util.py
index dd66947b23a2c79aebe205062d5e02e1801ac908..db969aa4b5d6a696907e0f31b7971564cd860320 100644 (file)
--- a/cinder/volume/drivers/vmware/read_write_util.py
+++ b/cinder/volume/drivers/vmware/read_write_util.py
@@ -26,7 +26,7 @@ import urllib2
 
 import six.moves.urllib.parse as urlparse
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.vmware import error_util
 from cinder.volume.drivers.vmware import vim_util

diff --git a/cinder/volume/drivers/vmware/vim.py b/cinder/volume/drivers/vmware/vim.py
index d9ce3257cc478fd88e6db7f82baab1879e3b8e97..84fd63376d775f88fe51d4919ad090146353ee6d 100644 (file)
--- a/cinder/volume/drivers/vmware/vim.py
+++ b/cinder/volume/drivers/vmware/vim.py
@@ -22,7 +22,7 @@ import urllib2
 
 import suds
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.volume.drivers.vmware import error_util
 from cinder.volume.drivers.vmware import vim_util
 

diff --git a/cinder/volume/drivers/vmware/vmdk.py b/cinder/volume/drivers/vmware/vmdk.py
index 14b039fb96d4ea66ca34d1f6b840cd78fcb9a99b..b301d3ba20ac2e811bdfd91808b3efda9eb561a9 100644 (file)
--- a/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@ -28,8 +28,8 @@ import os
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder.volume import driver

diff --git a/cinder/volume/drivers/vmware/vmware_images.py b/cinder/volume/drivers/vmware/vmware_images.py
index 49c67bc921a0bace2f3c6655e98eb3acf43388a7..3b47e28938b20187b2ec987afb4673df2778b45c 100644 (file)
--- a/cinder/volume/drivers/vmware/vmware_images.py
+++ b/cinder/volume/drivers/vmware/vmware_images.py
@@ -19,7 +19,7 @@ Utility functions for Image transfer.
 from eventlet import timeout
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.vmware import io_util
 from cinder.volume.drivers.vmware import read_write_util as rw_util

diff --git a/cinder/volume/drivers/vmware/volumeops.py b/cinder/volume/drivers/vmware/volumeops.py
index 33649b5019d453257cfea99c42e8411fa332b836..ecc3eafbd1b6e6b9ecc58da0d284b06ac3553eb0 100644 (file)
--- a/cinder/volume/drivers/vmware/volumeops.py
+++ b/cinder/volume/drivers/vmware/volumeops.py
@@ -17,7 +17,7 @@
 Implements operations on volumes residing on VMware datastores.
 """
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder.volume.drivers.vmware import error_util

diff --git a/cinder/volume/drivers/windows/vhdutils.py b/cinder/volume/drivers/windows/vhdutils.py
index 385bb4f53638ac01328f85d7e316774eff04a1c9..b43136095c827550fcc5d46697fcc6b139106b82 100644 (file)
--- a/cinder/volume/drivers/windows/vhdutils.py
+++ b/cinder/volume/drivers/windows/vhdutils.py
@@ -34,7 +34,7 @@ if os.name == 'nt':
     virtdisk = windll.virtdisk
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.windows import constants
 

diff --git a/cinder/volume/drivers/windows/windows_utils.py b/cinder/volume/drivers/windows/windows_utils.py
index 437b0d90397cadbd0067b5f0422b639ed37acad4..6728913d61a7cfbd38e114156ab2f285d2f29c28 100644 (file)
--- a/cinder/volume/drivers/windows/windows_utils.py
+++ b/cinder/volume/drivers/windows/windows_utils.py
@@ -22,7 +22,7 @@ import os
 from oslo.config import cfg
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.windows import constants
 

diff --git a/cinder/volume/drivers/zadara.py b/cinder/volume/drivers/zadara.py
index 1abf0d41cc74416c8342f0d9de46a198898830a8..c2385c20544f247a31479c82326fff5e1cf9ca81 100644 (file)
--- a/cinder/volume/drivers/zadara.py
+++ b/cinder/volume/drivers/zadara.py
@@ -26,7 +26,7 @@ from lxml import etree
 from oslo.config import cfg
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 

diff --git a/cinder/volume/flows/api/create_volume.py b/cinder/volume/flows/api/create_volume.py
index cae96ffa5f688cb3ab9fd0ce23aed449aaa6c4df..f65aa1f7015d11558f214e968386d4dcb1ada73a 100644 (file)
--- a/cinder/volume/flows/api/create_volume.py
+++ b/cinder/volume/flows/api/create_volume.py
@@ -18,7 +18,7 @@ from taskflow.utils import misc
 
 from cinder import exception
 from cinder import flow_utils
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/flows/common.py b/cinder/volume/flows/common.py
index 6ff83c87581460738248cf8ccea79a63886b858e..6841dd101e1ea71f4ec68a70bcfcdc54cb8b62c6 100644 (file)
--- a/cinder/volume/flows/common.py
+++ b/cinder/volume/flows/common.py
@@ -19,7 +19,7 @@
 import six
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/volume/flows/manager/create_volume.py b/cinder/volume/flows/manager/create_volume.py
index 0e361b51a0752f87c35c949c938d3ee1a0970188..a8cac6c447659c624c2c28889270506dea6baab9 100644 (file)
--- a/cinder/volume/flows/manager/create_volume.py
+++ b/cinder/volume/flows/manager/create_volume.py
@@ -19,8 +19,8 @@ from taskflow.utils import misc
 
 from cinder import exception
 from cinder import flow_utils
+from cinder.i18n import _
 from cinder.image import glance
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import timeutils

diff --git a/cinder/volume/flows/manager/manage_existing.py b/cinder/volume/flows/manager/manage_existing.py
index d18268268cbbfd3801c36a168a45f2cc6c1ca521..01d6328f3198c5cd67741b3dfbb576f228438c4f 100644 (file)
--- a/cinder/volume/flows/manager/manage_existing.py
+++ b/cinder/volume/flows/manager/manage_existing.py
@@ -17,7 +17,7 @@ from taskflow.patterns import linear_flow
 
 from cinder import exception
 from cinder import flow_utils
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume.flows.api import create_volume as create_api
 from cinder.volume.flows import common as flow_common

diff --git a/cinder/volume/iscsi.py b/cinder/volume/iscsi.py
index 0d893f0eb96ccf55f04c886d8da47d41be4795e6..3835ff578c3f0117d4feafc4d919b1cf7e58b298 100644 (file)
--- a/cinder/volume/iscsi.py
+++ b/cinder/volume/iscsi.py
@@ -18,7 +18,7 @@ import re
 
 from cinder.brick.iscsi import iscsi
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils as putils
 from cinder.volume import utils

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 740c7820462437ea52512875c0e43b536b2ef8c8..117776aea2bcede86f2b797f75f2aefc3b103c37 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -45,10 +45,10 @@ from cinder import compute
 from cinder import context
 from cinder import exception
 from cinder import flow_utils
+from cinder.i18n import _
 from cinder.image import glance
 from cinder import manager
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/qos_specs.py b/cinder/volume/qos_specs.py
index d8ee4e434e5f615926784bc26c4e1ddf10ce8b77..64a84417fd4bb545692d918c19d427320a68ecce 100644 (file)
--- a/cinder/volume/qos_specs.py
+++ b/cinder/volume/qos_specs.py
@@ -22,7 +22,7 @@ from oslo.db import exception as db_exc
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.volume import volume_types
 

diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py
index eb9bcaf7489ae366ec1f312d0938763e31664361..cd5cf6e23cb664a71f9d70d7b329c6c8fe14385f 100644 (file)
--- a/cinder/volume/utils.py
+++ b/cinder/volume/utils.py
@@ -22,7 +22,7 @@ from oslo.config import cfg
 
 from cinder.brick.local_dev import lvm as brick_lvm
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import strutils

diff --git a/cinder/volume/volume_types.py b/cinder/volume/volume_types.py
index 51399bff11298459d1cfdc8768a163a69843e556..1c96bde56fc27805383e3d9849944fc7ecd04fcc 100644 (file)
--- a/cinder/volume/volume_types.py
+++ b/cinder/volume/volume_types.py
@@ -26,7 +26,7 @@ from oslo.db import exception as db_exc
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/wsgi.py b/cinder/wsgi.py
index 336d923fe873495e0f51515e039e980fafc9b1dd..fb9a9b8a2e48ce044178c5b00040d96a3e67de8d 100644 (file)
--- a/cinder/wsgi.py
+++ b/cinder/wsgi.py
@@ -36,8 +36,8 @@ import webob.dec
 import webob.exc
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 

diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py b/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
index a4dde326c2c6988d57a2a2485f0a553795e4d1e0..b715e53379788cd2bee64c78ad2001dbacf6b906 100644 (file)
--- a/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
+++ b/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
@@ -20,8 +20,8 @@
 import paramiko
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as fabric_opts

diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
index fb072d3ecdddf5f80c05156d77af019cc8cb1ae5..d952de64969706efc6318db8ed661180f63514f7 100644 (file)
--- a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
+++ b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
@@ -27,8 +27,8 @@ import re
 from eventlet import greenthread
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder import ssh_utils

diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
index 8eee57a5caadc7473a5e1e2a82c27222b2dfc552..7e624b267a922bc984cde9d2b7e7d82172e5d9a5 100644 (file)
--- a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
+++ b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
@@ -33,8 +33,8 @@ add_connection and delete_connection interfaces.
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging

diff --git a/cinder/zonemanager/fc_san_lookup_service.py b/cinder/zonemanager/fc_san_lookup_service.py
index c781cf7fef8378aadd7050fd3df7c2ac092dde3a..dd338d3ece200117940390fed497ffd2a5778d7a 100644 (file)
--- a/cinder/zonemanager/fc_san_lookup_service.py
+++ b/cinder/zonemanager/fc_san_lookup_service.py
@@ -24,7 +24,7 @@ defined in this class.
 """
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.volume import configuration as config

diff --git a/cinder/zonemanager/fc_zone_manager.py b/cinder/zonemanager/fc_zone_manager.py
index 25f87e81e456867f7e518ee9030778120d06755e..e224972efd9a86f048a8dfb41349496c0d911bcf 100644 (file)
--- a/cinder/zonemanager/fc_zone_manager.py
+++ b/cinder/zonemanager/fc_zone_manager.py
@@ -34,7 +34,7 @@ detach operation.
 from oslo.config import cfg
 
 from cinder import exception
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.volume import configuration as config

diff --git a/cinder/zonemanager/utils.py b/cinder/zonemanager/utils.py
index 8b19467cfdcb22e54db4283fa447b41d80d21430..f9941592c00004fd8f613fde7248e0104695b776 100644 (file)
--- a/cinder/zonemanager/utils.py
+++ b/cinder/zonemanager/utils.py
@@ -19,7 +19,7 @@ Utility functions related to the Zone Manager.
 """
 import logging
 
-from cinder.openstack.common.gettextutils import _
+from cinder.i18n import _
 from cinder.openstack.common import log
 from cinder.volume.configuration import Configuration
 from cinder.volume import manager

diff --git a/doc/source/devref/il8n.rst b/doc/source/devref/il8n.rst
index e175af477fedb233ff2bcf104e3439c3f8df3d4e..68416e182a57768c9e411f49213654113bb22c88 100644 (file)
--- a/doc/source/devref/il8n.rst
+++ b/doc/source/devref/il8n.rst
@@ -7,27 +7,30 @@ language in different locales.
 To use gettext, make sure that the strings passed to the logger are wrapped
 in a ``_()`` function call. For example::
 
-    LOG.debug(_("block_device_mapping %s"), block_device_mapping)
+    LOG.info(_("block_device_mapping %s") % block_device_mapping)
 
-If you have multiple arguments, the convention is to use named parameters.
-It's common to use the ``locals()`` dict (which contains the names and values
-of the local variables in the current scope) to do the string interpolation.
-For example::
-
-    label = ...
-    sr_ref = ...
-    LOG.debug(_('Introduced %(label)s as %(sr_ref)s.') % locals())
+Do not use ``locals()`` for formatting messages because:
+1. It is not as clear as using explicit dicts.
+2. It could produce hidden errors during refactoring.
+3. Changing the name of a variable causes a change in the message.
+4. It creates a lot of otherwise unused variables.
 
 If you do not follow the project conventions, your code may cause the
 LocalizationTestCase.test_multiple_positional_format_placeholders test to fail
 in cinder/tests/test_localization.py.
 
-The ``_()`` function is brought into the global scope by doing::
+For translation to work properly, the top level scripts for Cinder need
+to first do the following before any Cinder modules are imported::
+
+    from cinder import i18n
+    i18n.enable_lazy()
+
+Any files that use the _() for translation then must have the following
+lines::
 
-    from cinder.openstack.common import gettextutils
-    gettextutils.install("cinder")
+    from cinder.i18n import _
 
-These lines are needed in any toplevel script before any cinder modules are
-imported. If this code is missing, it may result in an error that looks like::
+If the above code is missing, it may result in an error that looks
+like::
 
     NameError: name '_' is not defined

diff --git a/requirements.txt b/requirements.txt
index d85f822c2ef6af44364c26c087fcf66c22db6d69..99b9ff865186acc22bb60bdb1de2640be9da2126 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,3 +31,4 @@ stevedore>=0.14
 suds>=0.4
 WebOb>=1.2.3
 wsgiref>=0.1.2
+oslo.i18n>=0.1.0

diff --git a/tox.ini b/tox.ini
index 87feb47c141c037bd08697ac7d36e02035551f8a..d89ac8896a476eb4e3eaeaf60d1997d0b0a06780 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -78,3 +78,4 @@ exclude = .git,.venv,.tox,dist,tools,doc,common,*egg,build
 
 [hacking]
 local-check-factory = cinder.hacking.checks.factory
+import_exceptions = cinder.i18n