Revert "Re-enable lazy translation"

This reverts commit 6338d4656c

Change-Id: I078217b96b2d5fcca78b57c8827883a4b15ef9f0
This commit is contained in:
John Griffith 2014-03-10 22:00:50 +00:00 committed by Jay S. Bryant
parent ef3251623c
commit b3f0b7a2ca
22 changed files with 24 additions and 21 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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):

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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