From ce86dbaa96e555c696c1306833e3d0717dfaf2d2 Mon Sep 17 00:00:00 2001 From: "Jay S. Bryant" Date: Tue, 8 Jul 2014 14:04:56 -0500 Subject: [PATCH] Enable lazy translation for Cinder This patch is the final step for getting lazy translation re-enabled for Cinder. It removes the use of gettextutils.install() which is no longer needed with the addition of the explicit import of _() in all of Cinder's files. The configuration of 'cinder' catalog is handled by gettextutils. The install() function is replaced by gettextutils.enable_lazy() which properly enables lazy translation when _() or _LX() is used. Change-Id: I79e705f3852e8aa34034015199d56a8b23aeb8ef Implements-Blueprint: i18n-enablement --- bin/cinder-all | 2 +- bin/cinder-api | 2 +- bin/cinder-backup | 2 +- bin/cinder-clear-rabbit-queues | 2 +- bin/cinder-manage | 2 +- bin/cinder-rtstool | 1 + bin/cinder-scheduler | 2 +- bin/cinder-volume | 2 +- bin/cinder-volume-usage-audit | 2 +- cinder/db/sqlalchemy/migrate_repo/manage.py | 2 +- .../migrate_repo/versions/021_add_default_quota_class.py | 1 + 11 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bin/cinder-all b/bin/cinder-all index 6f26901d798..566273c266d 100755 --- a/bin/cinder-all +++ b/bin/cinder-all @@ -45,7 +45,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') +gettextutils.enable_lazy() # Need to register global_opts from cinder.common import config # noqa diff --git a/bin/cinder-api b/bin/cinder-api index 6e83e767855..6be285476c5 100755 --- a/bin/cinder-api +++ b/bin/cinder-api @@ -35,7 +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.install('cinder') +gettextutils.enable_lazy() # Need to register global_opts from cinder.common import config # noqa diff --git a/bin/cinder-backup b/bin/cinder-backup index 69f2c76bf05..fa747a63f76 100755 --- a/bin/cinder-backup +++ b/bin/cinder-backup @@ -39,7 +39,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') +gettextutils.enable_lazy() # 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 bab50ec52ca..2328b2befe9 100755 --- a/bin/cinder-clear-rabbit-queues +++ b/bin/cinder-clear-rabbit-queues @@ -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') +gettextutils.enable_lazy() # Need to register global_opts from cinder.common import config # noqa diff --git a/bin/cinder-manage b/bin/cinder-manage index 512cb8f3da8..a0448322661 100755 --- a/bin/cinder-manage +++ b/bin/cinder-manage @@ -73,7 +73,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') +gettextutils.enable_lazy() # Need to register global_opts from cinder.common import config # noqa diff --git a/bin/cinder-rtstool b/bin/cinder-rtstool index 410524345ea..7801268e728 100755 --- a/bin/cinder-rtstool +++ b/bin/cinder-rtstool @@ -22,6 +22,7 @@ import sys import rtslib gettext.install('cinder-rtstool', unicode=1) +gettext.enable_lazy() class RtstoolError(Exception): diff --git a/bin/cinder-scheduler b/bin/cinder-scheduler index a01fe3e4e9b..cc04e22329d 100755 --- a/bin/cinder-scheduler +++ b/bin/cinder-scheduler @@ -39,7 +39,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') +gettextutils.enable_lazy() # Need to register global_opts from cinder.common import config # noqa diff --git a/bin/cinder-volume b/bin/cinder-volume index 45c4ed4613e..f0fb798f9fd 100755 --- a/bin/cinder-volume +++ b/bin/cinder-volume @@ -43,7 +43,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') +gettextutils.enable_lazy() # 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 3f223d38a7b..13cb1c23118 100755 --- a/bin/cinder-volume-usage-audit +++ b/bin/cinder-volume-usage-audit @@ -53,7 +53,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') +gettextutils.enable_lazy() from cinder import context from cinder import db diff --git a/cinder/db/sqlalchemy/migrate_repo/manage.py b/cinder/db/sqlalchemy/migrate_repo/manage.py index 7cb4d399df8..d468a310707 100755 --- a/cinder/db/sqlalchemy/migrate_repo/manage.py +++ b/cinder/db/sqlalchemy/migrate_repo/manage.py @@ -18,7 +18,7 @@ import os from oslo.config import cfg from cinder.openstack.common import gettextutils -gettextutils.install('cinder') +gettextutils.enable_lazy() from cinder.db.sqlalchemy import migrate_repo from cinder import version diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py index 5c06e9c039a..000aeab1dd4 100644 --- a/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py +++ b/cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py @@ -14,6 +14,7 @@ import datetime +from cinder.openstack.common.gettextutils import _ from cinder.openstack.common import log as logging from oslo.config import cfg from sqlalchemy import MetaData, Table