Merge "Revert "Re-enable lazy translation""

bin/cinder-all

@@ -42,8 +42,7 @@ 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()
-gettextutils.install('cinder', lazy=True)
+gettextutils.install('cinder', lazy=False)
 
 # Need to register global_opts
 from cinder.common import config   # noqa

bin/cinder-api

@@ -32,8 +32,7 @@ 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()
-gettextutils.install('cinder', lazy=True)
+gettextutils.install('cinder', lazy=False)
 
 # Need to register global_opts
 from cinder.common import config  # noqa

bin/cinder-backup

@@ -36,8 +36,7 @@ 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()
-gettextutils.install('cinder', lazy=True)
+gettextutils.install('cinder')
 
 # Need to register global_opts
 from cinder.common import config  # noqa

bin/cinder-clear-rabbit-queues

@@ -35,8 +35,7 @@ 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()
-gettextutils.install('cinder', lazy=True)
+gettextutils.install('cinder')
 
 # Need to register global_opts
 from cinder.common import config  # noqa

bin/cinder-manage

@@ -70,8 +70,7 @@ 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()
-gettextutils.install('cinder', lazy=True)
+gettextutils.install('cinder')
 
 # Need to register global_opts
 from cinder.common import config  # noqa

bin/cinder-rtstool

@@ -16,14 +16,13 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+import gettext
 import re
 import sys
 
 import rtslib
 
-from cinder.openstack.common import gettextutils
-gettextutils.enable_lazy()
-gettextutils.install('cinder-rtstool', lazy=True)
+gettext.install('cinder-rtstool', unicode=1)
 
 
 class RtstoolError(Exception):

bin/cinder-scheduler

@@ -36,8 +36,7 @@ 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()
-gettextutils.install('cinder', lazy=True)
+gettextutils.install('cinder')
 
 # Need to register global_opts
 from cinder.common import config  # noqa

bin/cinder-volume

@@ -40,8 +40,7 @@ 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()
-gettextutils.install('cinder', lazy=True)
+gettextutils.install('cinder')
 
 # Need to register global_opts
 from cinder.common import config  # noqa

bin/cinder-volume-usage-audit

@@ -50,8 +50,7 @@ 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()
-gettextutils.install('cinder', lazy=True)
+gettextutils.install('cinder')
 
 from cinder import context
 from cinder import db

cinder/api/contrib/quotas.py

@@ -21,6 +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.openstack.common import strutils
 from cinder import quota
 

cinder/api/v1/limits.py

@@ -30,6 +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.openstack.common import importutils
 from cinder.openstack.common import jsonutils
 from cinder import quota

cinder/brick/exception.py

@@ -14,6 +14,7 @@
 
 """Exceptions for the Brick library."""
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

cinder/brick/initiator/connector.py

@@ -23,6 +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.openstack.common import lockutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall

cinder/brick/initiator/linuxfc.py

@@ -17,6 +17,7 @@
 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
 

cinder/brick/initiator/linuxscsi.py

@@ -19,6 +19,7 @@
 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
 

cinder/brick/local_dev/lvm.py

@@ -24,6 +24,7 @@ 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
 

cinder/brick/remotefs/remotefs.py

@@ -21,6 +21,7 @@ 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
 

cinder/common/config.py

@@ -29,6 +29,8 @@ import socket
 
 from oslo.config import cfg
 
+from cinder.openstack.common.gettextutils import _
+
 
 CONF = cfg.CONF
 

cinder/db/sqlalchemy/migrate_repo/manage.py

@@ -18,8 +18,7 @@ import os
 from oslo.config import cfg
 
 from cinder.openstack.common import gettextutils
-gettextutils.enable_lazy()
-gettextutils.install('cinder', lazy=True)
+gettextutils.install('cinder', lazy=False)
 
 from cinder.db.sqlalchemy import migrate_repo
 from cinder import version

cinder/exception.py

@@ -27,6 +27,7 @@ import sys
 from oslo.config import cfg
 import webob.exc
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

cinder/keymgr/conf_key_mgr.py

@@ -38,6 +38,7 @@ 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
 
 

cinder/policy.py

@@ -19,6 +19,7 @@
 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