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 33ae0ea849bbcb2a30f23ff2755ad009140fecb2..3e972223164bb907126fd50b354a70a5ba491133 100755 (executable)
--- 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 7c296c6bfd6afd44fb6bcb2e29b2254723996d6c..fda3e6a0042e9804eda5fd475ce46f268ed77cc9 100755 (executable)
--- 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 741b69ebfd12df3f3f9cf84eda4d50cda85357d5..826d56f30a6719de6414598e8934d9bdedeaaf39 100644 (file)
--- 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