From 002b3d87b5f1e35edcb6e14ce2e2827fc6c032a1 Mon Sep 17 00:00:00 2001
From: Tomáš Ehrlich <tomas.ehrlich@gmail.com>
Date: Sun, 31 May 2015 15:20:19 +0100
Subject: Fixed #24230 -- Added translated language name for i18n template
 tag/filter.

---
 docs/releases/1.9.txt            |  4 ++++
 docs/spelling_wordlist           |  1 +
 docs/topics/i18n/translation.txt | 11 +++++++++++
 3 files changed, 16 insertions(+)

(limited to 'docs')

diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 72e7fce2dc..bca086b207 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -187,6 +187,10 @@ Internationalization
   for languages which can be written in different scripts, for example Latin
   and Cyrillic (e.g. ``be@latin``).
 
+* Added the ``name_translated`` attribute to the object returned by the
+  :ttag:`get_language_info` template tag. Also added a corresponding template
+  filter: :tfilter:`language_name_translated`.
+
 Management Commands
 ^^^^^^^^^^^^^^^^^^^
 
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index a641bbeec3..0fe8fb7886 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -515,6 +515,7 @@ naturalday
 naturaltime
 nd
 needsinfo
+německy
 nestable
 neuroscientist
 newforms
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index bfaec965e4..d3f68d2ca5 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -870,6 +870,11 @@ You can then access the information::
     Name of language: {{ lang.name_local }}<br />
     Name in English: {{ lang.name }}<br />
     Bi-directional: {{ lang.bidi }}
+    Name in the active language: {{ lang.name_translated }}
+
+.. versionadded:: 1.9
+
+   The ``name_translated`` attribute was added.
 
 .. templatetag:: get_language_info_list
 
@@ -899,6 +904,7 @@ you can iterate over those languages in the template::
 .. templatefilter:: language_name
 .. templatefilter:: language_name_local
 .. templatefilter:: language_bidi
+.. templatefilter:: language_name_translated
 
 Template filters
 ~~~~~~~~~~~~~~~~
@@ -908,6 +914,11 @@ There are also simple filters available for convenience:
 * ``{{ LANGUAGE_CODE|language_name }}`` ("German")
 * ``{{ LANGUAGE_CODE|language_name_local }}`` ("Deutsch")
 * ``{{ LANGUAGE_CODE|language_bidi }}`` (False)
+* ``{{ LANGUAGE_CODE|language_name_translated }}`` ("německy", when active language is Czech)
+
+.. versionadded:: 1.9
+
+   The ``language_name_translated`` filter was added.
 
 .. _Django templates: ../templates_python/
 
-- 
cgit v1.3