diff options
| author | Matt Odden <mrodden@us.ibm.com> | 2013-10-01 08:52:15 +0000 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2013-10-16 09:21:55 -0500 |
| commit | 1a0297e1f5d1049c9e2dd362f478112cd6691980 (patch) | |
| tree | 93fbfa4432a799fdcb3225a45638d55437405dcf | |
| parent | 4285b798a36a206ad420326f593525740d71d7ac (diff) | |
| download | keystone-2013.2.rc4.tar.gz | |
Disable lazy gettext2013.2.rc42013.2
This change disables lazy gettext functionality in Keystone,
due to problems with character encoding and logging
detailed in bug 1225099.
It is part of a series of commits across all projects with
lazy gettext enabled.
Change-Id: Ia934a7df9386baf6ae8eb9ff48c24386c47ecd23
Partial-bug: 1225099
| -rwxr-xr-x | bin/keystone-all | 6 | ||||
| -rw-r--r-- | httpd/keystone.py | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/bin/keystone-all b/bin/keystone-all index f5ba56d13..beec3dfc5 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -39,11 +39,7 @@ from keystone.openstack.common import gettextutils # NOTE(blk-u): # gettextutils.install() must run to set _ before importing any modules that # contain static translated strings. -# -# Configure gettextutils for deferred translation of messages -# so that error messages in responses can be translated according to the -# Accept-Language in the request rather than the Keystone server locale. -gettextutils.install('keystone', lazy=True) +gettextutils.install('keystone') from keystone.common import environment from keystone.common import utils diff --git a/httpd/keystone.py b/httpd/keystone.py index 50ae07ea5..aa057136c 100644 --- a/httpd/keystone.py +++ b/httpd/keystone.py @@ -24,11 +24,7 @@ from keystone.openstack.common import gettextutils # NOTE(blk-u): # gettextutils.install() must run to set _ before importing any modules that # contain static translated strings. -# -# Configure gettextutils for deferred translation of messages -# so that error messages in responses can be translated according to the -# Accept-Language in the request rather than the Keystone server locale. -gettextutils.install('keystone', lazy=True) +gettextutils.install('keystone') from keystone.common import environment from keystone import config |