summaryrefslogtreecommitdiff
path: root/docs/ref/utils.txt
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2015-01-08 11:11:35 +0100
committerClaude Paroz <claude@2xlibre.net>2015-01-08 17:43:07 +0100
commit543df07720181fe23737ba14f1a261ff6f37f49c (patch)
treec84b18fc6ecfaa7309974c6e968e16507641bfd9 /docs/ref/utils.txt
parentd6c8121ed007e59bac9a68873248104ec30d5d8b (diff)
Fixed #24073 -- Returned None for get_language when translations are deactivated
This fixes a regression caused by f7c287fca9. Thanks Markus Holtermann for identifying the regression.
Diffstat (limited to 'docs/ref/utils.txt')
-rw-r--r--docs/ref/utils.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index 327f44bbfc..195647ea15 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -1098,7 +1098,14 @@ For a complete discussion on the usage of the following see the
.. function:: get_language()
- Returns the currently selected language code.
+ Returns the currently selected language code. Returns ``None`` if
+ translations are temporarily deactivated (by :func:`deactivate_all()` or
+ when ``None`` is passed to :func:`override()`).
+
+ .. versionchanged:: 1.8
+
+ Before Django 1.8, ``get_language()`` always returned
+ :setting:`LANGUAGE_CODE` when translations were deactivated.
.. function:: get_language_bidi()