From ac33ad9ec9e3516ff1bc837a308848b403d7e7a6 Mon Sep 17 00:00:00 2001
From: James Carey <jecarey@us.ibm.com>
Date: Thu, 7 Aug 2014 04:45:39 +0000
Subject: [PATCH] Use oslo.i18n

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

Change-Id: I1f361a8321fb02f03b4f3f3e2ef688fcf19514a3
---
 bin/cinder-all                                |  6 +-
 bin/cinder-api                                |  4 +-
 bin/cinder-backup                             |  4 +-
 bin/cinder-manage                             |  6 +-
 bin/cinder-rtstool                            |  7 +-
 bin/cinder-scheduler                          |  4 +-
 bin/cinder-volume                             |  4 +-
 bin/cinder-volume-usage-audit                 |  6 +-
 cinder/api/auth.py                            |  2 +-
 cinder/api/common.py                          |  2 +-
 cinder/api/contrib/admin_actions.py           |  2 +-
 cinder/api/contrib/backups.py                 |  2 +-
 .../contrib/extended_snapshot_attributes.py   |  2 +-
 cinder/api/contrib/hosts.py                   |  2 +-
 cinder/api/contrib/qos_specs_manage.py        |  2 +-
 cinder/api/contrib/quota_classes.py           |  2 +-
 cinder/api/contrib/quotas.py                  |  2 +-
 cinder/api/contrib/scheduler_hints.py         |  2 +-
 cinder/api/contrib/services.py                |  2 +-
 cinder/api/contrib/snapshot_actions.py        |  2 +-
 cinder/api/contrib/types_extra_specs.py       |  2 +-
 cinder/api/contrib/types_manage.py            |  2 +-
 cinder/api/contrib/volume_actions.py          |  2 +-
 cinder/api/contrib/volume_manage.py           |  2 +-
 cinder/api/contrib/volume_transfer.py         |  2 +-
 cinder/api/contrib/volume_type_encryption.py  |  2 +-
 cinder/api/contrib/volume_unmanage.py         |  2 +-
 cinder/api/extensions.py                      |  2 +-
 cinder/api/middleware/auth.py                 |  2 +-
 cinder/api/middleware/fault.py                |  2 +-
 cinder/api/middleware/sizelimit.py            |  2 +-
 cinder/api/openstack/__init__.py              |  2 +-
 cinder/api/openstack/urlmap.py                |  2 +-
 cinder/api/openstack/volume/__init__.py       |  2 +-
 cinder/api/openstack/volume/versions.py       |  2 +-
 cinder/api/openstack/wsgi.py                  | 10 +--
 cinder/api/sizelimit.py                       |  2 +-
 cinder/api/v1/limits.py                       |  2 +-
 cinder/api/v1/snapshot_metadata.py            |  2 +-
 cinder/api/v1/snapshots.py                    |  2 +-
 cinder/api/v1/volume_metadata.py              |  2 +-
 cinder/api/v1/volumes.py                      |  2 +-
 cinder/api/v2/limits.py                       |  2 +-
 cinder/api/v2/snapshot_metadata.py            |  2 +-
 cinder/api/v2/snapshots.py                    |  2 +-
 cinder/api/v2/types.py                        |  2 +-
 cinder/api/v2/volume_metadata.py              |  2 +-
 cinder/api/v2/volumes.py                      |  2 +-
 cinder/api/xmlutil.py                         |  2 +-
 cinder/backup/api.py                          |  2 +-
 cinder/backup/driver.py                       |  2 +-
 cinder/backup/drivers/ceph.py                 |  2 +-
 cinder/backup/drivers/swift.py                |  2 +-
 cinder/backup/drivers/tsm.py                  |  2 +-
 cinder/backup/manager.py                      |  2 +-
 cinder/brick/exception.py                     |  2 +-
 cinder/brick/initiator/connector.py           |  2 +-
 cinder/brick/initiator/linuxfc.py             |  2 +-
 cinder/brick/initiator/linuxscsi.py           |  2 +-
 cinder/brick/iscsi/iscsi.py                   |  2 +-
 cinder/brick/local_dev/lvm.py                 |  2 +-
 cinder/brick/remotefs/remotefs.py             |  2 +-
 cinder/common/config.py                       |  2 +-
 cinder/common/sqlalchemyutils.py              |  2 +-
 cinder/context.py                             |  2 +-
 cinder/db/sqlalchemy/api.py                   |  2 +-
 cinder/db/sqlalchemy/migrate_repo/manage.py   |  4 +-
 .../migrate_repo/versions/001_cinder_init.py  |  2 +-
 .../migrate_repo/versions/002_quota_class.py  |  2 +-
 .../versions/003_glance_metadata.py           |  2 +-
 .../migrate_repo/versions/008_add_backup.py   |  2 +-
 .../009_add_snapshot_metadata_table.py        |  2 +-
 .../versions/010_add_transfers_table.py       |  2 +-
 .../versions/015_drop_migrations_table.py     |  2 +-
 .../versions/016_drop_sm_tables.py            |  2 +-
 .../017_add_encryption_information.py         |  2 +-
 .../versions/018_add_qos_specs.py             |  2 +-
 .../020_add_volume_admin_metadata_table.py    |  2 +-
 .../versions/021_add_default_quota_class.py   |  2 +-
 .../023_add_expire_reservations_index.py      |  2 +-
 cinder/db/sqlalchemy/migration.py             |  2 +-
 cinder/exception.py                           |  2 +-
 cinder/flow_utils.py                          |  2 +-
 cinder/i18n.py                                | 70 +++++++++++++++++++
 cinder/image/glance.py                        |  2 +-
 cinder/image/image_utils.py                   |  2 +-
 cinder/keymgr/conf_key_mgr.py                 |  2 +-
 cinder/policy.py                              |  2 +-
 cinder/quota.py                               |  2 +-
 cinder/quota_utils.py                         |  2 +-
 cinder/scheduler/driver.py                    |  2 +-
 cinder/scheduler/filter_scheduler.py          |  2 +-
 cinder/scheduler/filters/capacity_filter.py   |  2 +-
 cinder/scheduler/flows/create_volume.py       |  2 +-
 cinder/scheduler/host_manager.py              |  2 +-
 cinder/scheduler/manager.py                   |  2 +-
 cinder/scheduler/scheduler_options.py         |  2 +-
 cinder/service.py                             |  2 +-
 cinder/ssh_utils.py                           |  2 +-
 cinder/tests/api/contrib/test_backups.py      |  2 +-
 cinder/tests/api/middleware/test_faults.py    | 30 +++++---
 cinder/tests/brick/test_brick_connector.py    |  2 +-
 cinder/tests/brick/test_brick_remotefs.py     |  2 +-
 cinder/tests/fake_driver.py                   |  2 +-
 cinder/tests/integrated/api/client.py         |  2 +-
 cinder/tests/test_backup_ceph.py              |  2 +-
 cinder/tests/test_backup_swift.py             |  2 +-
 cinder/tests/test_glusterfs.py                |  2 +-
 cinder/tests/test_ibm_xiv_ds8k.py             |  2 +-
 cinder/tests/test_misc.py                     |  2 +-
 cinder/tests/test_netapp.py                   |  2 +-
 cinder/tests/test_netapp_nfs.py               |  2 +-
 cinder/tests/test_rbd.py                      |  2 +-
 cinder/tests/test_storwize_svc.py             |  2 +-
 cinder/tests/test_volume_types.py             |  2 +-
 cinder/tests/test_wsgi.py                     | 23 +++---
 .../zonemanager/test_brcd_fc_zone_driver.py   |  2 +-
 cinder/transfer/api.py                        |  2 +-
 cinder/utils.py                               |  2 +-
 cinder/volume/api.py                          |  2 +-
 cinder/volume/driver.py                       |  2 +-
 cinder/volume/drivers/block_device.py         |  2 +-
 cinder/volume/drivers/coraid.py               |  2 +-
 cinder/volume/drivers/emc/emc_smis_common.py  |  2 +-
 cinder/volume/drivers/emc/emc_smis_iscsi.py   |  2 +-
 cinder/volume/drivers/emc/emc_vnx_cli.py      |  2 +-
 cinder/volume/drivers/eqlx.py                 |  2 +-
 cinder/volume/drivers/glusterfs.py            |  2 +-
 cinder/volume/drivers/hds/hds.py              |  2 +-
 cinder/volume/drivers/hds/iscsi.py            |  2 +-
 cinder/volume/drivers/hds/nfs.py              |  2 +-
 cinder/volume/drivers/huawei/__init__.py      |  2 +-
 cinder/volume/drivers/huawei/huawei_t.py      |  2 +-
 cinder/volume/drivers/huawei/huawei_utils.py  |  2 +-
 cinder/volume/drivers/huawei/rest_common.py   |  2 +-
 cinder/volume/drivers/huawei/ssh_common.py    |  2 +-
 cinder/volume/drivers/ibm/gpfs.py             |  2 +-
 cinder/volume/drivers/ibm/ibmnas.py           |  2 +-
 .../drivers/ibm/storwize_svc/__init__.py      |  2 +-
 .../drivers/ibm/storwize_svc/helpers.py       |  2 +-
 cinder/volume/drivers/ibm/storwize_svc/ssh.py |  2 +-
 cinder/volume/drivers/lvm.py                  |  2 +-
 cinder/volume/drivers/netapp/api.py           |  2 +-
 cinder/volume/drivers/netapp/common.py        |  2 +-
 .../volume/drivers/netapp/eseries/client.py   |  2 +-
 cinder/volume/drivers/netapp/eseries/iscsi.py |  2 +-
 cinder/volume/drivers/netapp/iscsi.py         |  2 +-
 cinder/volume/drivers/netapp/nfs.py           |  2 +-
 cinder/volume/drivers/netapp/ssc_utils.py     |  2 +-
 cinder/volume/drivers/netapp/utils.py         |  2 +-
 cinder/volume/drivers/nexenta/iscsi.py        |  2 +-
 cinder/volume/drivers/nexenta/jsonrpc.py      |  2 +-
 cinder/volume/drivers/nexenta/nfs.py          |  2 +-
 cinder/volume/drivers/nexenta/utils.py        |  2 +-
 cinder/volume/drivers/nfs.py                  |  2 +-
 cinder/volume/drivers/nimble.py               |  2 +-
 cinder/volume/drivers/pure.py                 |  2 +-
 cinder/volume/drivers/rbd.py                  |  2 +-
 .../volume/drivers/san/hp/hp_3par_common.py   |  2 +-
 cinder/volume/drivers/san/hp/hp_3par_fc.py    |  2 +-
 cinder/volume/drivers/san/hp/hp_3par_iscsi.py |  2 +-
 .../drivers/san/hp/hp_lefthand_cliq_proxy.py  |  2 +-
 .../drivers/san/hp/hp_lefthand_iscsi.py       |  2 +-
 .../drivers/san/hp/hp_lefthand_rest_proxy.py  |  2 +-
 cinder/volume/drivers/san/hp/hp_msa_common.py |  2 +-
 cinder/volume/drivers/san/san.py              |  2 +-
 cinder/volume/drivers/san/solaris.py          |  2 +-
 cinder/volume/drivers/scality.py              |  2 +-
 cinder/volume/drivers/sheepdog.py             |  2 +-
 cinder/volume/drivers/solidfire.py            |  2 +-
 cinder/volume/drivers/vmware/api.py           |  2 +-
 cinder/volume/drivers/vmware/error_util.py    |  2 +-
 cinder/volume/drivers/vmware/io_util.py       |  2 +-
 .../volume/drivers/vmware/read_write_util.py  |  2 +-
 cinder/volume/drivers/vmware/vim.py           |  2 +-
 cinder/volume/drivers/vmware/vmdk.py          |  2 +-
 cinder/volume/drivers/vmware/vmware_images.py |  2 +-
 cinder/volume/drivers/vmware/volumeops.py     |  2 +-
 cinder/volume/drivers/windows/vhdutils.py     |  2 +-
 .../volume/drivers/windows/windows_utils.py   |  2 +-
 cinder/volume/drivers/zadara.py               |  2 +-
 cinder/volume/flows/api/create_volume.py      |  2 +-
 cinder/volume/flows/common.py                 |  2 +-
 cinder/volume/flows/manager/create_volume.py  |  2 +-
 .../volume/flows/manager/manage_existing.py   |  2 +-
 cinder/volume/iscsi.py                        |  2 +-
 cinder/volume/manager.py                      |  2 +-
 cinder/volume/qos_specs.py                    |  2 +-
 cinder/volume/utils.py                        |  2 +-
 cinder/volume/volume_types.py                 |  2 +-
 cinder/wsgi.py                                |  2 +-
 .../brocade/brcd_fc_san_lookup_service.py     |  2 +-
 .../brocade/brcd_fc_zone_client_cli.py        |  2 +-
 .../drivers/brocade/brcd_fc_zone_driver.py    |  2 +-
 cinder/zonemanager/fc_san_lookup_service.py   |  2 +-
 cinder/zonemanager/fc_zone_manager.py         |  2 +-
 cinder/zonemanager/utils.py                   |  2 +-
 doc/source/devref/il8n.rst                    | 31 ++++----
 requirements.txt                              |  1 +
 tox.ini                                       |  1 +
 200 files changed, 337 insertions(+), 242 deletions(-)
 create mode 100644 cinder/i18n.py

diff --git a/bin/cinder-all b/bin/cinder-all
index 7243712bb..d062d4793 100755
--- 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 6be285476..dca754176 100755
--- 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 fa747a63f..1b474d3ba 100755
--- 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 0b25ae3ab..85f459a7c 100755
--- 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 fd61d2635..155dd6d49 100755
--- 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 cc04e2232..9c5a8af0a 100755
--- 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 f0fb798f9..8a51231cf 100755
--- 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 2b143dc87..caa1dee9f 100755
--- 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 df9c130c2..ca61179cf 100644
--- 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 5574352a7..ad7a8ddf7 100644
--- 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 99e513345..bfd6f94d6 100644
--- 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 7547dc2c5..8ce51dc79 100644
--- 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 f21cfd393..34e0151c5 100644
--- 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 824106f25..0d6dc4ea1 100644
--- 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 5abbd7a3e..dadc1d181 100644
--- 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 a5df4a1c0..ef74413d2 100644
--- 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 739eb1e2e..a7de8d536 100644
--- 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 c7d8cf96f..190772883 100644
--- 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 7bec9c3e1..88a408699 100644
--- 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 e50e7fb25..1b33fab4e 100644
--- 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 175f87aef..951368a75 100644
--- 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 7a175f435..bbe530269 100644
--- 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 31c039f9a..88048d426 100644
--- 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 c9303c5a7..07a7545a6 100755
--- 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 a3e7deb8e..f510aa694 100644
--- 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 c29cbd190..9cbfc7ae6 100644
--- 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 6486ffa16..4eeba5abc 100755
--- 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 6209433e5..1e040388f 100644
--- 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 2522dbd41..74d3afbbf 100644
--- 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 0472bef4f..b312ae636 100644
--- 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 85fccb56b..b87db3366 100644
--- 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 ea046fed7..7cc1d1fa2 100644
--- 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 92bd15406..84b13c68f 100644
--- 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 90894c094..e4a819d29 100644
--- 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 e8596dc17..c403876a6 100644
--- 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 9fb59b2f6..657291dae 100644
--- 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 dd19efd01..638432291 100644
--- 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 de70243f9..cf9be30ad 100644
--- 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 17bc5ae81..d1913f493 100644
--- 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 8ec4954fc..7960230f6 100644
--- 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 b01ec6f01..8130f627c 100644
--- 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 c262b5ca0..ebf195a89 100644
--- 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 a373bf9cd..b285b08b5 100644
--- 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 17bc5ae81..d1913f493 100644
--- 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 2af416303..68c72f685 100644
--- 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 c25c9eb02..fa37dc56a 100644
--- 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 e11c6bbc8..d34d40c12 100644
--- 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 9945f1207..e218e1b5b 100644
--- 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 364ff3d6e..de69fc975 100644
--- 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 ae943e44e..090db2769 100644
--- 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 b69ca53db..04c84fb28 100644
--- 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 a60ae691b..2a57978b2 100644
--- 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 9777a24fa..1c1751f31 100644
--- 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 520b808dd..b2c085a9d 100644
--- 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 d20e4440f..e6ac5446e 100644
--- 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 59a953c79..598dca24a 100644
--- 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 52c6b8355..b58e726b2 100644
--- 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 2b6099c82..391f747b6 100644
--- 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 9e023aac3..54da31117 100644
--- 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 c42798048..eee84ad8e 100644
--- 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 5f5aad280..798075f7c 100644
--- 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 ccc4f7fcc..4b67d1e45 100755
--- 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 ce51bb911..9e9db35f7 100644
--- 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 f2c5f4534..a49689337 100644
--- 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 6b2c6c3d8..cfb6dd8ab 100644
--- 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 fb1595f0d..2ad31ef35 100644
--- 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 d468a3107..d12e89188 100755
--- 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 40a54fcb2..ab85a7c1e 100644
--- 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 4f3d65d61..da97a6f97 100644
--- 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 ba37edb76..8c3ae7b90 100644
--- 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 95ef42ea2..22b2eeda2 100644
--- 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 b1afc52a9..90dfdfe17 100644
--- 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 248bee45e..37d129293 100644
--- 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 b69ff346e..8fda7123b 100644
--- 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 f20b6fd0c..e6b6ccd45 100644
--- 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 0d42b293d..d2f7eedf1 100644
--- 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 45220b482..6be70cb4a 100644
--- 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 e9fd7ba12..e8cdee8d4 100644
--- 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 000aeab1d..f09bf3951 100644
--- 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 996ebbdfc..c8a0e7fdf 100644
--- 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 6a7ae61ca..f6aa7c5fe 100644
--- 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 860f5fcf2..fcfd4ad95 100644
--- 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 12020fe7a..c5816c883 100644
--- 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
index 000000000..d16b5c6c5
--- /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 3f4f339ac..d91582ec4 100644
--- 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 1ef9e2876..1d51e94c7 100644
--- 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 9915bfe57..e6ee56d1c 100644
--- 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 9e3999efa..432642c9f 100644
--- 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 472976d5b..8a234d798 100644
--- 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 bce6e4016..da07cf81e 100644
--- 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 0ed9228da..25df391de 100644
--- 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 ac496f937..b32c4d39f 100644
--- 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 1210fb3aa..b7dca83ab 100644
--- 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 b8b04703a..43007a4ed 100644
--- 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 0f83e963a..1bddeffce 100644
--- 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 5f872a912..a6993c1c5 100644
--- 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 0d405fdf1..661e899ea 100644
--- 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 3554f67c2..f04022b2b 100755
--- 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 bbeb030db..87831560d 100644
--- 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 088b15dad..0cfd9ea2c 100644
--- 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 83100feca..5f9eb75e2 100644
--- 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 53289c85f..f2ff6caa1 100644
--- 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 f152af716..9af722a56 100644
--- 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 e51d27f43..aaa961798 100644
--- 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 b50b3a101..eeb599ef5 100644
--- 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 26aeede56..fb905ebee 100644
--- 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 dfc21b32a..4a0834a7d 100644
--- 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 3ed220b05..c81e48f8f 100644
--- 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 e6bd12ab5..3d0995b62 100644
--- 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 4c7815745..8458bf5b6 100644
--- 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 652e66df7..f8c7d4eb7 100644
--- 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 dbe6c6d74..15a4067e6 100644
--- 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 6d8902a1d..10f447c92 100644
--- 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 0f44e73bf..4b26d515a 100644
--- 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 79ffd338f..0ca7781c5 100644
--- 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 323347c4c..214e5c556 100644
--- 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 05b8d7927..810ca76ce 100644
--- 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 07099e97a..da1c1e269 100644
--- 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 72f674926..bdc9d92c9 100644
--- 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 89355772e..f91161ef5 100644
--- 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 20d290bc0..bd1c4ef1a 100644
--- 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 5f217f74d..35e16bfbf 100644
--- 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 c05bbbf84..d97b21000 100644
--- 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 f3ff96a06..d4a2f9f15 100644
--- 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 60ab3f2a5..18cb35005 100644
--- 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 9324c6e00..8f7886b16 100644
--- 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 1030bc8f2..9a583cffb 100644
--- 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 0345d0546..13f30f73d 100644
--- 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 136a2df80..57f7b618b 100644
--- 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 7685fc729..fd287ac97 100644
--- 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 dbfa17054..c93ddfdcd 100644
--- 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 c9ca0798a..3fca8eed4 100644
--- 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 280599d43..fd960a553 100644
--- 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 148eca589..9c6b9e5cf 100644
--- 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 de6fabbca..262a9321c 100644
--- 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 c9fe1e820..a40ac3f84 100644
--- 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 ea2308f7d..160caf417 100644
--- 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 d1313ee0f..9bf1ae73e 100644
--- 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 a9591bff9..f63856ebf 100644
--- 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 a762c2fc0..127dfcfb7 100644
--- 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 5ca7ad9ac..8b3876a96 100644
--- 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 f984a506c..bfc2a9274 100644
--- 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 b04df272d..35ac582e5 100644
--- 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 173650394..d2e04804b 100644
--- 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 b192b7189..112fb423b 100644
--- 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 39181cf28..0d476f5e3 100644
--- 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 630b87b8d..cc8e8e03e 100644
--- 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 8899a7c2f..1a16415ca 100644
--- 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 aee4244e5..c6daa5bbb 100644
--- 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 54acc2334..eda599ea9 100644
--- 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 db35583ad..7bd9f5c90 100644
--- 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 22248df03..0cb654434 100644
--- 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 168d0169c..a5562ad26 100644
--- 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 9b92421ed..55f040970 100644
--- 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 9c519aede..123b0e23f 100644
--- 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 255a54eb3..d9bf96dc7 100644
--- 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 686b0bf02..0c0525426 100644
--- 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 827675c12..eb868bc27 100644
--- 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 6f3931464..e4a5bcb87 100644
--- 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 ffa9ca80f..6bc6e746a 100644
--- 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 e8374814d..9d3c3e31f 100644
--- 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 5127204d6..420362a0e 100644
--- 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 43d8d8b04..a4671a828 100644
--- 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 9486711b6..170bb9bec 100644
--- 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 1e2ab7a82..b10739bc1 100644
--- 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 a64361508..81f66df30 100644
--- 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 63d5cd438..74ef541cd 100644
--- 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 c92ff4322..6b9182f42 100644
--- 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 30993e55c..e05796ee5 100644
--- 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 ed21ddf88..a6e90d250 100644
--- 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 b2ce28f48..40901f6b4 100644
--- 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 fa65b47d0..cce8cfd76 100644
--- 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 08dbd2291..514f45fe2 100644
--- 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 dd66947b2..db969aa4b 100644
--- 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 d9ce3257c..84fd63376 100644
--- 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 14b039fb9..b301d3ba2 100644
--- 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 49c67bc92..3b47e2893 100644
--- 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 33649b501..ecc3eafbd 100644
--- 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 385bb4f53..b43136095 100644
--- 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 437b0d903..6728913d6 100644
--- 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 1abf0d41c..c2385c205 100644
--- 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 cae96ffa5..f65aa1f70 100644
--- 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 6ff83c875..6841dd101 100644
--- 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 0e361b51a..a8cac6c44 100644
--- 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 d18268268..01d6328f3 100644
--- 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 0d893f0eb..3835ff578 100644
--- 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 740c78204..117776aea 100644
--- 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 d8ee4e434..64a84417f 100644
--- 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 eb9bcaf74..cd5cf6e23 100644
--- 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 51399bff1..1c96bde56 100644
--- 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 336d923fe..fb9a9b8a2 100644
--- 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 a4dde326c..b715e5337 100644
--- 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 fb072d3ec..d952de649 100644
--- 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 8eee57a5c..7e624b267 100644
--- 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 c781cf7fe..dd338d3ec 100644
--- 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 25f87e81e..e224972ef 100644
--- 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 8b19467cf..f9941592c 100644
--- 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 e175af477..68416e182 100644
--- 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 d85f822c2..99b9ff865 100644
--- 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 87feb47c1..d89ac8896 100644
--- 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
-- 
2.45.2