diff --git a/bin/cinder-all b/bin/cinder-all index 6cfeedcce9b..9591d1574fa 100755 --- a/bin/cinder-all +++ b/bin/cinder-all @@ -30,7 +30,6 @@ continue attempting to launch the rest of the services. import eventlet eventlet.monkey_patch() -import gettext import os import sys @@ -40,7 +39,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath( if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")): sys.path.insert(0, possible_topdir) -gettext.install('cinder', unicode=1) +from cinder.openstack.common import gettextutils +gettextutils.install('cinder') from cinder import flags from cinder.openstack.common import log as logging diff --git a/bin/cinder-api b/bin/cinder-api index 68c06782b83..0f05b519c8e 100755 --- a/bin/cinder-api +++ b/bin/cinder-api @@ -26,7 +26,6 @@ import eventlet eventlet.monkey_patch() -import gettext import os import sys @@ -36,7 +35,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath( if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")): sys.path.insert(0, possible_topdir) -gettext.install('cinder', unicode=1) +from cinder.openstack.common import gettextutils +gettextutils.install('cinder') from cinder import flags from cinder.openstack.common import log as logging diff --git a/bin/cinder-backup b/bin/cinder-backup index d0278a35ad5..71f83006a29 100755 --- a/bin/cinder-backup +++ b/bin/cinder-backup @@ -17,7 +17,6 @@ """Starter script for Cinder Volume Backup.""" -import gettext import os import sys @@ -33,7 +32,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')): sys.path.insert(0, possible_topdir) -gettext.install('cinder', unicode=1) +from cinder.openstack.common import gettextutils +gettextutils.install('cinder') from cinder import flags from cinder.openstack.common import log as logging diff --git a/bin/cinder-clear-rabbit-queues b/bin/cinder-clear-rabbit-queues index aa701706a33..684a56578ae 100755 --- a/bin/cinder-clear-rabbit-queues +++ b/bin/cinder-clear-rabbit-queues @@ -24,7 +24,6 @@ """ import datetime -import gettext import os import sys import time @@ -37,8 +36,8 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) -gettext.install('cinder', unicode=1) - +from cinder.openstack.common import gettextutils +gettextutils.install('cinder') from oslo.config import cfg diff --git a/bin/cinder-manage b/bin/cinder-manage index c358757d2a7..63f638fc435 100755 --- a/bin/cinder-manage +++ b/bin/cinder-manage @@ -54,7 +54,6 @@ CLI interface for cinder management. """ -import gettext import os import sys import uuid @@ -72,7 +71,8 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) -gettext.install('cinder', unicode=1) +from cinder.openstack.common import gettextutils +gettextutils.install('cinder') from oslo.config import cfg diff --git a/bin/cinder-scheduler b/bin/cinder-scheduler index 33015b3cad8..28edd8bbf90 100755 --- a/bin/cinder-scheduler +++ b/bin/cinder-scheduler @@ -22,7 +22,6 @@ import eventlet eventlet.monkey_patch() -import gettext import os import sys @@ -34,7 +33,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')): sys.path.insert(0, possible_topdir) -gettext.install('cinder', unicode=1) +from cinder.openstack.common import gettextutils +gettextutils.install('cinder') from cinder import flags from cinder.openstack.common import log as logging diff --git a/bin/cinder-volume b/bin/cinder-volume index bf144830b26..9c36238d667 100755 --- a/bin/cinder-volume +++ b/bin/cinder-volume @@ -22,7 +22,6 @@ import eventlet eventlet.monkey_patch() -import gettext import os import sys @@ -34,7 +33,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')): sys.path.insert(0, possible_topdir) -gettext.install('cinder', unicode=1) +from cinder.openstack.common import gettextutils +gettextutils.install('cinder') from cinder import flags from cinder.openstack.common import log as logging diff --git a/bin/cinder-volume-usage-audit b/bin/cinder-volume-usage-audit index 053de79a13d..13ea447a9f2 100755 --- a/bin/cinder-volume-usage-audit +++ b/bin/cinder-volume-usage-audit @@ -34,7 +34,6 @@ Jan 1 through Dec 31 of the previous year. """ -import gettext import os import sys import traceback @@ -47,7 +46,9 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) -gettext.install('cinder', unicode=1) +from cinder.openstack.common import gettextutils +gettextutils.install('cinder') + from cinder import context from cinder import db from cinder import flags diff --git a/doc/source/devref/il8n.rst b/doc/source/devref/il8n.rst index 7e53731d743..e175af477fe 100644 --- a/doc/source/devref/il8n.rst +++ b/doc/source/devref/il8n.rst @@ -24,8 +24,8 @@ in cinder/tests/test_localization.py. The ``_()`` function is brought into the global scope by doing:: - import gettext - gettext.install("cinder", unicode=1) + from cinder.openstack.common import gettextutils + gettextutils.install("cinder") These lines are needed in any toplevel script before any cinder modules are imported. If this code is missing, it may result in an error that looks like::