Re-enable lazy translation

This patch re-enables lazy translation to enable REST API
responses to be translated to the requested locale (I.E. setting
'Accept-Language: zh-CN'.)

This patch also removes the unnecessary manual import of
'cinder.openstack.common.gettextutils _' in Cinder code.  Since _ is
still being imported in the cinder.openstack.common files from Oslo
we still need to set gettexttutils.enable_lazy().  enable_lazy will
be able to be removed once the manual imports of _ have been removed
from Oslo.

implements-bp: i18n-messages
Change-Id: I0b5a35a2cc28d97d12ceccccd58565b487fef428

diff --git a/bin/cinder-all b/bin/cinder-all
index a3b2fcf7f70d8f82c7036244e7e1257d4f0bb3b5..c14d8e63459b11f0740a4ec09ab7137fce1956ea 100755 (executable)
--- a/bin/cinder-all
+++ b/bin/cinder-all
@@ -42,7 +42,8 @@ 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.install('cinder', lazy=False)
+gettextutils.enable_lazy()
+gettextutils.install('cinder', lazy=True)
 
 # Need to register global_opts
 from cinder.common import config   # noqa

diff --git a/bin/cinder-api b/bin/cinder-api
index 953575c9effe57d50d0280a61795bb159b26d77a..0c6529b0f284dd78cee7150fb6a51a31586e153e 100755 (executable)
--- a/bin/cinder-api
+++ b/bin/cinder-api
@@ -32,7 +32,8 @@ 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.install('cinder', lazy=False)
+gettextutils.enable_lazy()
+gettextutils.install('cinder', lazy=True)
 
 # Need to register global_opts
 from cinder.common import config  # noqa

diff --git a/bin/cinder-backup b/bin/cinder-backup
index 2b5a634cca2cfd4e8b16632120dcf78ff7638af2..9de9ba605f36a39d4bfc075cb8f12ba6d2e01720 100755 (executable)
--- a/bin/cinder-backup
+++ b/bin/cinder-backup
@@ -36,7 +36,8 @@ 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.install('cinder')
+gettextutils.enable_lazy()
+gettextutils.install('cinder', lazy=True)
 
 # Need to register global_opts
 from cinder.common import config  # noqa

diff --git a/bin/cinder-clear-rabbit-queues b/bin/cinder-clear-rabbit-queues
index 4a59b8b3d5edb904e3e36d6462e925718fd3075e..51aa217f0882cf71e90f950bc757313c051db80b 100755 (executable)
--- a/bin/cinder-clear-rabbit-queues
+++ b/bin/cinder-clear-rabbit-queues
@@ -35,7 +35,8 @@ 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.install('cinder')
+gettextutils.enable_lazy()
+gettextutils.install('cinder', lazy=True)
 
 # Need to register global_opts
 from cinder.common import config  # noqa

diff --git a/bin/cinder-manage b/bin/cinder-manage
index 7b113c865fa18e5dc556f2ce735fa36aa8332297..5a47bdf891bc0891177f3a2d1d6942d05915b06c 100755 (executable)
--- a/bin/cinder-manage
+++ b/bin/cinder-manage
@@ -70,7 +70,8 @@ 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.install('cinder')
+gettextutils.enable_lazy()
+gettextutils.install('cinder', lazy=True)
 
 # Need to register global_opts
 from cinder.common import config  # noqa

diff --git a/bin/cinder-rtstool b/bin/cinder-rtstool
index 07fe5947d9ca9e31fefef2bec6be5fd7c91c34f4..6cbf44472b785e203f650660ff833f40b9778132 100755 (executable)
--- a/bin/cinder-rtstool
+++ b/bin/cinder-rtstool
@@ -16,13 +16,14 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import gettext
+import gettextutils
 import re
 import sys
 
 import rtslib
 
-gettext.install('cinder-rtstool', unicode=1)
+gettextutils.enable_lazy()
+gettextutils.install('cinder-rtstool', lazy=True)
 
 
 class RtstoolError(Exception):

diff --git a/bin/cinder-scheduler b/bin/cinder-scheduler
index e8ee1175bafa01038561a04282a04c9bdc7cb63d..6281fbbd40cdbf20fabf20b7cc361038347e6c2d 100755 (executable)
--- a/bin/cinder-scheduler
+++ b/bin/cinder-scheduler
@@ -36,7 +36,8 @@ 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.install('cinder')
+gettextutils.enable_lazy()
+gettextutils.install('cinder', lazy=True)
 
 # Need to register global_opts
 from cinder.common import config  # noqa

diff --git a/bin/cinder-volume b/bin/cinder-volume
index 0a04626c3ba2898134de736d6eb7e6b4aa7550ab..e9af49cf34b0ef46e41e5f30060a5d947ba5c143 100755 (executable)
--- a/bin/cinder-volume
+++ b/bin/cinder-volume
@@ -40,7 +40,8 @@ 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.install('cinder')
+gettextutils.enable_lazy()
+gettextutils.install('cinder', lazy=True)
 
 # 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 53ea460ae215dd0f7feeb0d435ca20ade6bd749d..fd6dcd1962065e9b68013ecefdc4a2dbc47f064f 100755 (executable)
--- a/bin/cinder-volume-usage-audit
+++ b/bin/cinder-volume-usage-audit
@@ -50,7 +50,8 @@ 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.install('cinder')
+gettextutils.enable_lazy()
+gettextutils.install('cinder', lazy=True)
 
 from cinder import context
 from cinder import db

diff --git a/cinder/api/contrib/quotas.py b/cinder/api/contrib/quotas.py
index 739eb1e2e0b55d4359e94278c72e8f12ebb8db1e..a950cbc02321e7edc22779fd9f8de795e0420825 100644 (file)
--- a/cinder/api/contrib/quotas.py
+++ b/cinder/api/contrib/quotas.py
@@ -21,7 +21,6 @@ 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.openstack.common import strutils
 from cinder import quota
 

diff --git a/cinder/api/v1/limits.py b/cinder/api/v1/limits.py
index de70243f98521beb429bc77504951e968fa79caa..76a1a3752e5e83ff3de66cbb8441284a90ee3416 100644 (file)
--- a/cinder/api/v1/limits.py
+++ b/cinder/api/v1/limits.py
@@ -30,7 +30,6 @@ 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.openstack.common import importutils
 from cinder.openstack.common import jsonutils
 from cinder import quota

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

diff --git a/cinder/brick/initiator/connector.py b/cinder/brick/initiator/connector.py
index 3ffc6b5901396bae0b6ed46ff2c9aa79961a437e..57a9076a83f43f4ebb6f08aa712425bfcd6f496c 100644 (file)
--- a/cinder/brick/initiator/connector.py
+++ b/cinder/brick/initiator/connector.py
@@ -23,7 +23,6 @@ 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.openstack.common import lockutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall

diff --git a/cinder/brick/initiator/linuxfc.py b/cinder/brick/initiator/linuxfc.py
index 2b6099c825470aacd94014355a4b8493bdd5ab3f..fe43046f0909c9d1ac99d77ef3edbfcd8b357117 100644 (file)
--- a/cinder/brick/initiator/linuxfc.py
+++ b/cinder/brick/initiator/linuxfc.py
@@ -17,7 +17,6 @@
 import errno
 
 from cinder.brick.initiator import linuxscsi
-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/initiator/linuxscsi.py b/cinder/brick/initiator/linuxscsi.py
index 83e41d99db9b39fd43e75c224f6033c5dc7eece5..9b2c776df7d6cfcc2819827954daecb206622ae8 100644 (file)
--- a/cinder/brick/initiator/linuxscsi.py
+++ b/cinder/brick/initiator/linuxscsi.py
@@ -19,7 +19,6 @@
 import os
 
 from cinder.brick import executor
-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 6b51316f15bf26105fe8bb88589e99609a814568..8e5a09bfb9bd260d58a113f1c43ba032167b4060 100644 (file)
--- a/cinder/brick/local_dev/lvm.py
+++ b/cinder/brick/local_dev/lvm.py
@@ -24,7 +24,6 @@ import itertools
 
 from cinder.brick import exception
 from cinder.brick import executor
-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/remotefs/remotefs.py b/cinder/brick/remotefs/remotefs.py
index c68e18b881db0f9d64f88e8bf4339ecb600d1f3c..62a8f18cf69439974af2cef36ee0fbb93246a5d6 100755 (executable)
--- a/cinder/brick/remotefs/remotefs.py
+++ b/cinder/brick/remotefs/remotefs.py
@@ -21,7 +21,6 @@ import re
 import six
 
 from cinder.brick import exception
-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/common/config.py b/cinder/common/config.py
index 969f8c3c1de4629585ef5daf61f25ec38ec5143b..86def44073bdfa3f1dc3746b86de0995c541b324 100644 (file)
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -29,8 +29,6 @@ import socket
 
 from oslo.config import cfg
 
-from cinder.openstack.common.gettextutils import _
-
 
 CONF = cfg.CONF
 

diff --git a/cinder/db/sqlalchemy/migrate_repo/manage.py b/cinder/db/sqlalchemy/migrate_repo/manage.py
index a714db6240470ef12a872a9b3a9f17472d06d1c0..101cea3791077a2317742362492576898efa6205 100755 (executable)
--- a/cinder/db/sqlalchemy/migrate_repo/manage.py
+++ b/cinder/db/sqlalchemy/migrate_repo/manage.py
@@ -18,7 +18,8 @@ import os
 from oslo.config import cfg
 
 from cinder.openstack.common import gettextutils
-gettextutils.install('cinder', lazy=False)
+gettextutils.enable_lazy()
+gettextutils.install('cinder', lazy=True)
 
 from cinder.db.sqlalchemy import migrate_repo
 from cinder import version

diff --git a/cinder/exception.py b/cinder/exception.py
index 03688a1dd33ff17a2d1001b17a67817abe5655a9..8ef9c7cb6aceee62c12e881478089bbfcb0719d0 100644 (file)
--- a/cinder/exception.py
+++ b/cinder/exception.py
@@ -27,7 +27,6 @@ import sys
 from oslo.config import cfg
 import webob.exc
 
-from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

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

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