Fixes #16072 -- incorrect documentation for multiple expressions inside a blocktrans tag

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Chris Beaven 2011-05-23 01:52:49 +00:00
parent fcf7fbc68c
commit 17a6bb0f70
1 changed files with 5 additions and 6 deletions

View File

@ -491,13 +491,15 @@ for use within the translation block. Examples::
This will have {{ myvar }} inside. This will have {{ myvar }} inside.
{% endblocktrans %} {% endblocktrans %}
If you need to bind more than one expression inside a ``blocktrans`` tag, You can use multiple expressions inside a single ``blocktrans`` tag::
separate the pieces with ``and``::
{% 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 }} This is {{ book_t }} by {{ author_t }}
{% endblocktrans %} {% 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: This tag also provides for pluralization. To use it:
* Designate and bind a counter value with the name ``count``. This value will * 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>` same :ref:`notes regarding ungettext variables <pluralization-var-notes>`
apply. 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 Reverse URL lookups cannot be carried out within the ``blocktrans`` and should
be retrieved (and stored) beforehand:: be retrieved (and stored) beforehand::