summaryrefslogtreecommitdiff
path: root/django/utils/translation/trans_null.py
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2012-02-18 13:37:30 +0000
committerJannis Leidel <jannis@leidel.info>2012-02-18 13:37:30 +0000
commit7dd0ceba2e8413d79c2aaff62733f4631cd3c1e7 (patch)
tree3e3cf3d88531a6fca68ee79978d398d6e1c52062 /django/utils/translation/trans_null.py
parent52b06e29c76dc9a5184edf3bbea64f0d4d5442b1 (diff)
Fixed #17720 -- Stopped the LocaleMiddleware from overeagerly using the request path for language activation if it's actually not wanted. Thanks to Anssi Kääriäinen for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/translation/trans_null.py')
-rw-r--r--django/utils/translation/trans_null.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/translation/trans_null.py b/django/utils/translation/trans_null.py
index 5c9edb1dd4..0fabc707ce 100644
--- a/django/utils/translation/trans_null.py
+++ b/django/utils/translation/trans_null.py
@@ -55,7 +55,7 @@ def to_locale(language):
else:
return language.lower()
-def get_language_from_request(request):
+def get_language_from_request(request, check_path=False):
return settings.LANGUAGE_CODE
def get_language_from_path(request):