Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.3.X] Fixes #16072 -- incorrect documentation for multiple expressi…

…ons 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
  • Loading branch information...
commit 18ecfad76785746b14e441d7379fc3b086da8d7a 1 parent b9bdc96
Chris Beaven authored May 23, 2011

Showing 1 changed file with 4 additions and 5 deletions. Show diff stats Hide diff stats

  1. 9  docs/topics/i18n/internationalization.txt
9  docs/topics/i18n/internationalization.txt
@@ -490,13 +490,15 @@ for use within the translation block. Examples::
490 490
     This will have {{ myvar }} inside.
491 491
     {% endblocktrans %}
492 492
 
493  
-If you need to bind more than one expression inside a ``blocktrans`` tag,
494  
-separate the pieces with ``and``::
  493
+You can use multiple expressions inside a single ``blocktrans`` tag::
495 494
 
496 495
     {% blocktrans with book_t=book|title and author_t=author|title %}
497 496
     This is {{ book_t }} by {{ author_t }}
498 497
     {% endblocktrans %}
499 498
 
  499
+.. note:: The previous more verbose format is still supported:
  500
+   ``{% blocktrans with book|title as book_t and author|title as author_t %}``
  501
+
500 502
 This tag also provides for pluralization. To use it:
501 503
 
502 504
     * 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
528 530
 same :ref:`notes regarding ungettext variables <pluralization-var-notes>`
529 531
 apply.
530 532
 
531  
-.. note:: The previous more verbose format is still supported:
532  
-   ``{% blocktrans with book|title as book_t and author|title as author_t %}``
533  
-
534 533
 Reverse URL lookups cannot be carried out within the ``blocktrans`` and should
535 534
 be retrieved (and stored) beforehand::
536 535
 

0 notes on commit 18ecfad

Please sign in to comment.
Something went wrong with that request. Please try again.