From: Doug Hellmann Date: Tue, 1 Oct 2013 22:01:59 +0000 (-0400) Subject: Disable lazy translation X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=52a98c29755f893154263a7793c0135c763938f6;p=openstack-build%2Fcinder-build.git Disable lazy translation Late in the Havana cycle bug 1225099 was found in the lazy translation code, and to be safe it was decided to disable lazy translation for Havana. This change does that. Change-Id: Ia934a7df9386baf6ae8eb9ff48c24386c47ecd23 Partial-bug: 1225099 --- diff --git a/bin/cinder-all b/bin/cinder-all index 33ae0ea84..3e9722231 100755 --- a/bin/cinder-all +++ b/bin/cinder-all @@ -44,7 +44,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.install('cinder', lazy=True) +gettextutils.install('cinder', lazy=False) from cinder.common import config # Need to register global_opts from cinder.openstack.common import log as logging diff --git a/bin/cinder-api b/bin/cinder-api index 7c296c6bf..fda3e6a00 100755 --- a/bin/cinder-api +++ b/bin/cinder-api @@ -38,7 +38,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.install('cinder', lazy=True) +gettextutils.install('cinder', lazy=False) from cinder.common import config # Need to register global_opts from cinder.openstack.common import log as logging diff --git a/cinder/db/sqlalchemy/migrate_repo/manage.py b/cinder/db/sqlalchemy/migrate_repo/manage.py index 741b69ebf..826d56f30 100644 --- a/cinder/db/sqlalchemy/migrate_repo/manage.py +++ b/cinder/db/sqlalchemy/migrate_repo/manage.py @@ -20,7 +20,7 @@ import os from oslo.config import cfg from cinder.openstack.common import gettextutils -gettextutils.install('cinder', lazy=True) +gettextutils.install('cinder', lazy=False) from cinder.db.sqlalchemy import migrate_repo import cinder.openstack.common.db.sqlalchemy.session