summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-05-08 12:07:07 +0100
committerMark McLoughlin <markmc@redhat.com>2013-05-29 10:40:00 +0100
commit7ce56d5f45f7112f0b25061473e64145fc840c98 (patch)
treefd0860917372258411ecdd3f512dda1b1111e8da /bin
parent2879d42de12cfb5a141197debbf7eaa53cd6750f (diff)
downloadkeystone-7ce56d5f45f7112f0b25061473e64145fc840c98.tar.gz
keystone-7ce56d5f45f7112f0b25061473e64145fc840c98.tar.xz
keystone-7ce56d5f45f7112f0b25061473e64145fc840c98.zip
Add KEYSTONE_LOCALEDIR env variable
Part of fixing bug #995287 Syncs these two commits from oslo-incubator: Support overriding oslo localedir too Add a gettextutils.install() helper function to get a new gettextutils.install() function which allows the default localedir to be overwritten via an environment variable. A few things to note: - the gettext.install() call is moved from common.config to the toplevel scripts to fix cases (e.g. the legacy auth_token middleware) where keystone code might be imported by a program who's default translation domain is not 'keystone'. - we add a gettext.install() call in keystone.test so that tests have the _() builtin installed. Change-Id: I86562b3a65d371673bb21f7179eecc7602bc0775
Diffstat (limited to 'bin')
-rwxr-xr-xbin/keystone-all3
-rwxr-xr-xbin/keystone-manage4
2 files changed, 6 insertions, 1 deletions
diff --git a/bin/keystone-all b/bin/keystone-all
index b38e552b..7e6711b5 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
@@ -24,6 +24,7 @@ import pbr.version
from keystone.common import utils
from keystone.common import wsgi_server
from keystone import config
+from keystone.openstack.common import gettextutils
from keystone.openstack.common import importutils
@@ -70,6 +71,8 @@ def serve(*servers):
if __name__ == '__main__':
+ gettextutils.install('keystone')
+
dev_conf = os.path.join(possible_topdir,
'etc',
'keystone.conf')
diff --git a/bin/keystone-manage b/bin/keystone-manage
index b440ad15..89ada5bd 100755
--- a/bin/keystone-manage
+++ b/bin/keystone-manage
@@ -13,11 +13,13 @@ if os.path.exists(os.path.join(possible_topdir,
'__init__.py')):
sys.path.insert(0, possible_topdir)
-
from keystone import cli
+from keystone.openstack.common import gettextutils
if __name__ == '__main__':
+ gettextutils.install('keystone')
+
dev_conf = os.path.join(possible_topdir,
'etc',
'keystone.conf')