openstack/keystone
Code Issues Proposed changes

Merge "Use system locale when Accept-Language header is not provided"

Browse Source
This commit is contained in:
Jenkins 2013-08-26 18:56:48 +00:00 committed by Gerrit Code Review
commit 7eed453e44
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystone/common/wsgi.py
View File

@ -129,9 +129,10 @@ class Request(webob.Request):
HTTP header passed in the request.
"""
if not self.accept_language:
return None
return self.accept_language.best_match(
gettextutils.get_available_languages('keystone'),
default_match='en_US')
gettextutils.get_available_languages('keystone'))
class BaseApplication(object):

8
keystone/tests/test_wsgi.py
View File

@ -249,9 +249,9 @@ class LocalizedResponseTest(test.TestCase):
self.stubs.Set(gettext, 'find', fake_gettext_find)
def test_request_match_default(self):
# The default language if no Accept-Language is provided is en_US
# The default language if no Accept-Language is provided is None
req = wsgi.Request.blank('/')
self.assertEquals(req.best_match_language(), 'en_US')
self.assertIsNone(req.best_match_language())
def test_request_match_language_expected(self):
# If Accept-Language is a supported language, best_match_language()
@ -264,12 +264,12 @@ class LocalizedResponseTest(test.TestCase):
def test_request_match_language_unexpected(self):
# If Accept-Language is a language we do not support,
# best_match_language() returns the default.
# best_match_language() returns None.
self._set_expected_languages(all_locales=['it'])
req = wsgi.Request.blank('/', headers={'Accept-Language': 'zh'})
self.assertEquals(req.best_match_language(), 'en_US')
self.assertIsNone(req.best_match_language())
def test_localized_message(self):
# If the accept-language header is set on the request, the localized