summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-06-16 16:34:20 +0000
committerJannis Leidel <jannis@leidel.info>2011-06-16 16:34:20 +0000
commit44b03484ec0ec8843d34becbce1d4f0649066627 (patch)
treefc00f27c1ac5c40b376d267e66ba9dd56b891e70 /docs
parentaad6f21b29946bf4cc78d5d28330497cb916e35f (diff)
Fixed #15908 -- Mention blocktrans in the pluralize filter documentation section. Thanks, Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/templates/builtins.txt2
-rw-r--r--docs/topics/i18n/internationalization.txt2
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 3b650f1f69..2216b6efef 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1794,6 +1794,8 @@ Example::
You have {{ num_cherries }} cherr{{ num_cherries|pluralize:"y,ies" }}.
+.. note:: Use :ttag:`blocktrans` to pluralize translated strings.
+
.. templatefilter:: pprint
pprint
diff --git a/docs/topics/i18n/internationalization.txt b/docs/topics/i18n/internationalization.txt
index 559f60fcc5..4850f7e7bc 100644
--- a/docs/topics/i18n/internationalization.txt
+++ b/docs/topics/i18n/internationalization.txt
@@ -451,6 +451,8 @@ It's not possible to mix a template variable inside a string within ``{% trans
%}``. If your translations require strings with variables (placeholders), use
``{% blocktrans %}`` instead.
+.. templatetag:: blocktrans
+
``blocktrans`` template tag
---------------------------