diff options
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/translation/__init__.py | 1 | ||||
| -rw-r--r-- | django/utils/translation/trans_null.py | 2 | ||||
| -rw-r--r-- | django/utils/translation/trans_real.py | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py index 69820a2fc4..0b3f78e486 100644 --- a/django/utils/translation/__init__.py +++ b/django/utils/translation/__init__.py @@ -17,7 +17,6 @@ __all__ = [ "get_language_from_request", "get_language_info", "get_language_bidi", - "get_supported_language_variant", "check_for_language", "to_language", "to_locale", diff --git a/django/utils/translation/trans_null.py b/django/utils/translation/trans_null.py index 595a705e2b..c8bfb1256e 100644 --- a/django/utils/translation/trans_null.py +++ b/django/utils/translation/trans_null.py @@ -53,7 +53,7 @@ def check_for_language(x): def get_language_from_request(request, check_path=False): - return None + return settings.LANGUAGE_CODE def get_language_from_path(request): diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index 46a94b99ff..872c80b00f 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -583,7 +583,11 @@ def get_language_from_request(request, check_path=False): return get_supported_language_variant(accept_lang) except LookupError: continue - return None + + try: + return get_supported_language_variant(settings.LANGUAGE_CODE) + except LookupError: + return settings.LANGUAGE_CODE @functools.lru_cache(maxsize=1000) |