summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-08-27 05:10:20 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-08-27 05:10:20 +0000
commit3b993b29954addeba4a0ddbb58aeeeeeaa87c5cf (patch)
treec5831f03e959139bbe80d4ada163336d5622d61a /django/utils
parent8226b8c9576107c281d15040b17fa696cdaf87c6 (diff)
Fixed #8584 -- Fixed a case where the wrong locale might be made active in the
locale detection loop. Thanks, Ramiro Morales. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/translation/trans_real.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index 65eac8a62c..7a0e104b37 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -389,7 +389,7 @@ def get_language_from_request(request):
'django.mo')
if os.path.exists(langfile):
_accepted[normalized] = lang
- return lang
+ return lang
return settings.LANGUAGE_CODE