summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorŁukasz Langa <lukasz@langa.pl>2013-02-23 19:41:33 +0100
committerŁukasz Langa <lukasz@langa.pl>2013-02-23 19:41:33 +0100
commit539900f117dce5d9b51e2b9e8ff225c423060d52 (patch)
tree46060279e79d7ce15199435f6c34f779ee27547f /django/utils
parente3296268de8f2c387c4155ae1b8d39bb109f265d (diff)
Fixes #17866: Vary: Accept-Language header when language prefix used
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/translation/__init__.py4
-rw-r--r--django/utils/translation/trans_null.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
index 292e4db869..ace87fab4b 100644
--- a/django/utils/translation/__init__.py
+++ b/django/utils/translation/__init__.py
@@ -165,8 +165,8 @@ def to_locale(language):
def get_language_from_request(request, check_path=False):
return _trans.get_language_from_request(request, check_path)
-def get_language_from_path(path):
- return _trans.get_language_from_path(path)
+def get_language_from_path(path, supported=None):
+ return _trans.get_language_from_path(path, supported=supported)
def templatize(src, origin=None):
return _trans.templatize(src, origin)
diff --git a/django/utils/translation/trans_null.py b/django/utils/translation/trans_null.py
index 5c51468204..7ef07793a4 100644
--- a/django/utils/translation/trans_null.py
+++ b/django/utils/translation/trans_null.py
@@ -58,6 +58,6 @@ def to_locale(language):
def get_language_from_request(request, check_path=False):
return settings.LANGUAGE_CODE
-def get_language_from_path(request):
+def get_language_from_path(request, supported=None):
return None