Author: SmileyChris
Date: 2011-05-22 18:54:37 -0700 (Sun, 22 May 2011)
New Revision: 16269

Modified:
   django/branches/releases/1.3.X/docs/topics/i18n/internationalization.txt
Log:
[1.3.X] Fixes #16072 -- incorrect documentation for multiple expressions inside 
a blocktrans tag

Backport of r16268 from trunk.

Modified: 
django/branches/releases/1.3.X/docs/topics/i18n/internationalization.txt
===================================================================
--- django/branches/releases/1.3.X/docs/topics/i18n/internationalization.txt    
2011-05-23 01:52:49 UTC (rev 16268)
+++ django/branches/releases/1.3.X/docs/topics/i18n/internationalization.txt    
2011-05-23 01:54:37 UTC (rev 16269)
@@ -490,13 +490,15 @@
     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 @@
 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::
 

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to