Commit 18ecfad7 authored by Chris Beaven's avatar Chris Beaven
Browse files

[1.3.X] Fixes #16072 -- incorrect documentation for multiple expressions inside a blocktrans tag

Backport of r16268 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent b9bdc96f
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -490,13 +490,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 %}
    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
@@ -528,9 +530,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::