From: Barry Warsaw <barry@python.org>
Date: Wed, 20 Jun 2001 19:41:40 +0000 (+0000)
Subject: write(): Karl Eichwalder points out that the #, flag comments should
X-Git-Tag: v2.2a3~1502
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c94ce58e79f31966ee81dda0965bbe74e0d0cec;p=thirdparty%2FPython%2Fcpython.git

write(): Karl Eichwalder points out that the #, flag comments should
be outputted just before the msgid lines.
---

diff --git a/Tools/i18n/pygettext.py b/Tools/i18n/pygettext.py
index 11ce185af95a..bd9c0bca6012 100755
--- a/Tools/i18n/pygettext.py
+++ b/Tools/i18n/pygettext.py
@@ -338,11 +338,12 @@ class TokenEater:
             rentries = reverse[rkey]
             rentries.sort()
             for k, v in rentries:
+                isdocstring = 0
                 # If the entry was gleaned out of a docstring, then add a
                 # comment stating so.  This is to aid translators who may wish
                 # to skip translating some unimportant docstrings.
                 if reduce(operator.__add__, v.values()):
-                    print >> fp, '#, docstring'
+                    isdocstring = 1
                 # k is the message string, v is a dictionary-set of (filename,
                 # lineno) tuples.  We want to sort the entries in v first by
                 # file name and then by line number.
@@ -370,6 +371,8 @@ class TokenEater:
                             locline = "#:" + s
                     if len(locline) > 2:
                         print >> fp, locline
+                if isdocstring:
+                    print >> fp, '#, docstring'
                 print >> fp, 'msgid', normalize(k)
                 print >> fp, 'msgstr ""\n'