summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-26 18:30:41 +0000
committerGerrit Code Review <review@openstack.org>2014-03-26 18:30:41 +0000
commitd99e34d0d0f69d69457ce6f770b6e86141a53613 (patch)
tree0ff7931d7bb7cfd7d00fae08851fd161fa85c5be
parent76ef2a87db593d5ecc74ed41cd8578ca1f318bfb (diff)
parent7a1c13aec30496abca8ba1fd8223b3d00f8cb912 (diff)
downloadkeystone-2014.1.rc1.tar.gz
Merge "Enable lazy translations in httpd/keystone.py"2014.1.rc1
-rw-r--r--httpd/keystone.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/httpd/keystone.py b/httpd/keystone.py
index b5da6ac12..21761fd6b 100644
--- a/httpd/keystone.py
+++ b/httpd/keystone.py
@@ -17,6 +17,13 @@ import os
from paste import deploy
+from keystone.openstack.common import gettextutils
+# NOTE(dstanek): gettextutils.enable_lazy() must be called before
+# gettextutils._() is called to ensure it has the desired lazy lookup
+# behavior. This includes cases, like keystone.exceptions, where
+# gettextutils._() is called at import time.
+gettextutils.enable_lazy()
+
from keystone.common import dependency
from keystone.common import environment
from keystone.common import sql