mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

[1.1.X] Fixed #7720 - Fallback to the base language if the sub language given in the language cookie doesn't exist. Thanks, djoume and Ramiro Morales.

Browse Source 
Backport of r12442.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2010-02-16 12:52:04 +00:00
parent 6a3c915933
commit df1ad561b1
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/utils/translation/trans_real.py
View File

@ -354,6 +354,10 @@ def get_language_from_request(request):
return lang_code return lang_code
lang_code = request.COOKIES.get(settings.LANGUAGE_COOKIE_NAME) lang_code = request.COOKIES.get(settings.LANGUAGE_COOKIE_NAME)
if lang_code and lang_code not in supported:
lang_code = lang_code.split('-')[0] # e.g. if fr-ca is not supported fallback to fr
if lang_code and lang_code in supported and check_for_language(lang_code): if lang_code and lang_code in supported and check_for_language(lang_code):
return lang_code return lang_code

25
tests/regressiontests/i18n/misc.py
View File

@ -85,6 +85,21 @@ source tree.
>>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'es-ar,de'} >>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'es-ar,de'}
>>> g(r) >>> g(r)
'es-ar' 'es-ar'
# Now test that we parse language preferences stored in a cookie correctly.
>>> from django.conf import settings
>>> r.COOKIES = {settings.LANGUAGE_COOKIE_NAME: 'pt-br'}
>>> r.META = {}
>>> g(r)
'pt-br'
>>> r.COOKIES = {settings.LANGUAGE_COOKIE_NAME: 'pt'}
>>> r.META = {}
>>> g(r)
'pt'
>>> r.COOKIES = {settings.LANGUAGE_COOKIE_NAME: 'es'}
>>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'de'}
>>> g(r)
'es'
""" """
# Python 2.3 and 2.4 return slightly different results for completely bogus # Python 2.3 and 2.4 return slightly different results for completely bogus
@ -98,9 +113,14 @@ This test assumes there won't be a Django translation to a US variation
of the Spanish language, a safe assumption. When the user sets it of the Spanish language, a safe assumption. When the user sets it
as the preferred language, the main 'es' translation should be selected as the preferred language, the main 'es' translation should be selected
instead. instead.
>>> r.COOKIES = {}
>>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'es-us'} >>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'es-us'}
>>> g(r) >>> g(r)
'es' 'es'
>>> r.COOKIES = {settings.LANGUAGE_COOKIE_NAME: 'es-us'}
>>> r.META = {}
>>> g(r)
'es'
""" """
tests += """ tests += """
@ -108,7 +128,12 @@ This tests the following scenario: there isn't a main language (zh)
translation of Django but there is a translation to variation (zh_CN) translation of Django but there is a translation to variation (zh_CN)
the user sets zh-cn as the preferred language, it should be selected by the user sets zh-cn as the preferred language, it should be selected by
Django without falling back nor ignoring it. Django without falling back nor ignoring it.
>>> r.COOKIES = {}
>>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'zh-cn,de'} >>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'zh-cn,de'}
>>> g(r) >>> g(r)
'zh-cn' 'zh-cn'
>>> r.COOKIES = {settings.LANGUAGE_COOKIE_NAME: 'zh-cn'}
>>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'de'}
>>> g(r)
'zh-cn'
""" """