Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 539bebab3f338af74de9e0caa4e0f94abcc7b31b 1 parent 2aa8890
Russell Keith-Magee freakboy3742 authored
Showing with 5 additions and 5 deletions.
  1. +5 −5 docs/topics/i18n.txt
10 docs/topics/i18n.txt
View
@@ -251,9 +251,9 @@ The ``{% trans %}`` template tag translates either a constant string
<title>{% trans "This is the title." %}</title>
<title>{% trans myvar %}</title>
-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::
<title>{% trans "myvar" noop %}</title>
@@ -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".
Please sign in to comment.
Something went wrong with that request. Please try again.