Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes #16072 -- incorrect documentation for multiple expressions insi…

…de a blocktrans tag

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 17a6bb0f700dcdf422d88dcb110b76098e948674 1 parent fcf7fbc
@SmileyChris SmileyChris authored
Showing with 5 additions and 6 deletions.
  1. +5 −6 docs/topics/i18n/internationalization.txt
View
11 docs/topics/i18n/internationalization.txt
@@ -491,13 +491,15 @@ for use within the translation block. Examples::
This will have {{ myvar }} inside.
{% endblocktrans %}
-If you need to bind more than one expression inside a ``blocktrans`` tag,
-separate the pieces with ``and``::
+You can use multiple expressions inside a single ``blocktrans`` tag::
- {% blocktrans with book_t=book|title and author_t=author|title %}
+ {% blocktrans with book_t=book|title author_t=author|title %}
This is {{ book_t }} by {{ author_t }}
{% endblocktrans %}
+.. note:: The previous more verbose format is still supported:
+ ``{% blocktrans with book|title as book_t and author|title as author_t %}``
+
This tag also provides for pluralization. To use it:
* Designate and bind a counter value with the name ``count``. This value will
@@ -529,9 +531,6 @@ construct is internally converted to an ``ungettext`` call. This means the
same :ref:`notes regarding ungettext variables <pluralization-var-notes>`
apply.
-.. note:: The previous more verbose format is still supported:
- ``{% blocktrans with book|title as book_t and author|title as author_t %}``
-
Reverse URL lookups cannot be carried out within the ``blocktrans`` and should
be retrieved (and stored) beforehand::
Please sign in to comment.
Something went wrong with that request. Please try again.