summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2021-01-06 13:16:24 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-01-14 17:50:04 +0100
commitd134b0b93ee10a2128c595997cbc6022c4a982f7 (patch)
tree3122aa4e5bf0abec1e3f202e64957f55a71e8e8c /docs
parent52a238ddf2ceb5211daa2ab23c626473685729b5 (diff)
Refs #15902 -- Stopped set_language() storing user's language in the session.
Per deprecation timeline.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/utils.txt10
-rw-r--r--docs/releases/1.7.txt11
-rw-r--r--docs/releases/4.0.txt3
3 files changed, 8 insertions, 16 deletions
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index b04e1196d4..52c5101e9f 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -1099,13 +1099,3 @@ For a complete discussion on the usage of the following see the
Turns a Django template into something that is understood by ``xgettext``.
It does so by translating the Django translation tags into standard
``gettext`` function invocations.
-
-.. data:: LANGUAGE_SESSION_KEY
-
- Session key under which the active language for the current session is
- stored.
-
- .. deprecated:: 3.0
-
- The language won't be stored in the session in Django 4.0. Use the
- :setting:`LANGUAGE_COOKIE_NAME` cookie instead.
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 6403ae0b51..2841294067 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -663,12 +663,11 @@ Internationalization
* The :class:`~django.middleware.locale.LocaleMiddleware` now stores the user's
selected language with the session key ``_language``. This should only be
- accessed using the :data:`~django.utils.translation.LANGUAGE_SESSION_KEY`
- constant. Previously it was stored with the key ``django_language`` and the
- ``LANGUAGE_SESSION_KEY`` constant did not exist, but keys reserved for Django
- should start with an underscore. For backwards compatibility ``django_language``
- is still read from in 1.7. Sessions will be migrated to the new key
- as they are written.
+ accessed using the ``LANGUAGE_SESSION_KEY`` constant. Previously it was
+ stored with the key ``django_language`` and the ``LANGUAGE_SESSION_KEY``
+ constant did not exist, but keys reserved for Django should start with an
+ underscore. For backwards compatibility ``django_language`` is still read
+ from in 1.7. Sessions will be migrated to the new key as they are written.
* The :ttag:`blocktrans` tag now supports a ``trimmed`` option. This
option will remove newline characters from the beginning and the end of the
diff --git a/docs/releases/4.0.txt b/docs/releases/4.0.txt
index b5b4d343aa..43e94a790b 100644
--- a/docs/releases/4.0.txt
+++ b/docs/releases/4.0.txt
@@ -254,6 +254,9 @@ to remove usage of these features.
* ``django.utils.translation.ugettext()``, ``ugettext_lazy()``,
``ugettext_noop()``, ``ungettext()``, and ``ungettext_lazy()`` are removed.
+* ``django.views.i18n.set_language()`` doesn't set the user language in
+ ``request.session`` (key ``_language``).
+
See :ref:`deprecated-features-3.1` for details on these changes, including how
to remove usage of these features.