From 5cd551409e3f445a8c7cf59b8cf038d709607dec Mon Sep 17 00:00:00 2001 From: Tim Graham <timograham@gmail.com> Date: Fri, 20 Mar 2015 12:06:32 -0400 Subject: [PATCH] [1.8.x] Fixed #24503 -- Added docs on LANGUAGE_CODE fallback change in 1.8. Thanks Pakal and Claude. Backport of 8219eabbba6e8f6d8569792615935011b5cf0771 from master --- docs/ref/settings.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 4744098754..1bc489f2e4 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1657,8 +1657,14 @@ It serves two purposes: * If the locale middleware isn't in use, it decides which translation is served to all users. -* If the locale middleware is active, it provides the fallback translation when - no translation exist for a given literal to the user's preferred language. +* If the locale middleware is active, it provides a fallback language in case the + user's preferred language can't be determined or is not supported by the Web + site. It also provides the fallback translation when a translation for a + given literal doesn't exist for the user's preferred language. + +.. versionchanged:: 1.8 + + The fallback for translation literals was added. See :ref:`how-django-discovers-language-preference` for more details.