From 539bebab3f338af74de9e0caa4e0f94abcc7b31b Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 24 Mar 2009 11:44:51 +0000 Subject: [PATCH] Fixed #10503 -- Clarified docs on the operation of the noop option to {% trans %}. Thanks to liangent for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10151 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/topics/i18n.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/topics/i18n.txt b/docs/topics/i18n.txt index 00df558c23..aca727a442 100644 --- a/docs/topics/i18n.txt +++ b/docs/topics/i18n.txt @@ -251,9 +251,9 @@ The ``{% trans %}`` template tag translates either a constant string {% trans "This is the title." %} {% trans myvar %} -If the ``noop`` option is present, variable lookup still takes place but the -translation is skipped. This is useful when "stubbing out" content that will -require translation in the future:: +If the ``noop`` option is present, variable lookup still takes place, but the +original text will be returned unchanged. This is useful when "stubbing out" +content that will require translation in the future:: {% trans "myvar" noop %} @@ -995,9 +995,9 @@ test or compile a changed message file, you will need the ``gettext`` utilities: * Add ``;C:\Program Files\gettext-utils\bin`` at the end of the ``Variable value`` field -You may also use ``gettext`` binaries you have obtained elsewhere, so long as +You may also use ``gettext`` binaries you have obtained elsewhere, so long as the ``xgettext --version`` command works properly. Some version 0.14.4 binaries -have been found to not support this command. Do not attempt to use Django +have been found to not support this command. Do not attempt to use Django translation utilities with a ``gettext`` package if the command ``xgettext --version`` entered at a Windows command prompt causes a popup window saying "xgettext.exe has generated errors and will be closed by Windows".