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

diff --git a/bin/cinder-all b/bin/cinder-all
index 6f26901d798dad0200af6c98a7aa0920f52183de..566273c266db10bfb6001153f376c7790f9d4dce 100755 (executable)
--- 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 6e83e767855f70e50254623f7c26f707e2d34b3c..6be285476c51348e98107e49253562f12c0a0dc3 100755 (executable)
--- 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 69f2c76bf05720e8b6ee0e4292f99d03d3c4a78f..fa747a63f762579d6c8d035b6a4b2328f7b28e0c 100755 (executable)
--- 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 bab50ec52ca1a8e3454ee11046deed284fdc770e..2328b2befe937979b6b484cd260293418dd1bb1c 100755 (executable)
--- 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 512cb8f3da8eb11b1d28dc2cea66f02a545f8495..a0448322661341d00e296818fc8939f7d1c03fea 100755 (executable)
--- 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 410524345ea18a2bcc6b84bba56d2a06f4d4a124..7801268e72815df68bdd83cfd4af99746a43f9e6 100755 (executable)
--- 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 a01fe3e4e9ba175287433ec5ee95dbb910675f28..cc04e22329d2327025faaa912fa2c9018f5b382c 100755 (executable)
--- 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 45c4ed4613e9eefdaf63f23866558ad0f38d4970..f0fb798f9fd07b246ea67cf4e1ed92d1fb12d922 100755 (executable)
--- 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 3f223d38a7bb27980cdc8641cb29b8451ae3a5bb..13cb1c23118779bc00fe5afa170f5a987f435e28 100755 (executable)
--- 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 7cb4d399df881ffd32df7db00c44dddd6d3af1d7..d468a310707b50d1a46f7add86e2c89aeeb12721 100755 (executable)
--- 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 5c06e9c039ad0e195a4e500495b70eeed972c280..000aeab1dd4d4c101075d854b572f79c3e8164ba 100644 (file)
--- 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