1. WAKAYAMA shirou
  2. sphinx


k...@cozmixng.org  committed e971e1a

[i18n] fix reference line separator.

This commit fixes part of 5976facae92c commit:
Refactor comment generating code for message catalogs.

The commit says "Refactor" but it changes original code behavior.
In original code, source locations are separated with " " but
in refactored code, source locations are separated with ", ".

msgmerge and po-mode that are part of the GNU gettext toolset treats
"," as part of source location. We can fix this problem by one of them:

* Use " " instead of ", " as source locations separator
in a "reference" line.
* Put "reference" lines. Each "reference" line just has a source location.

This commit uses the latter because the latter has more higher readablility.

See also about "reference" line but it doesn't say about separator:

  • Participants
  • Parent commits f554126
  • Branches i18n-po-fix-reference-line-separator

Comments (0)

Files changed (1)

File sphinx/builders/gettext.py

View file
  • Ignore whitespace
                 for message in catalog.messages:
                     positions = catalog.metadata[message]
-                    # generate "#: file1:line1 file2:line2 ..."
-                    pofile.write(u"#: %s\n" % ", ".join("%s:%s" %
+                    # generate "#: file1:line1\n#: file2:line2 ..."
+                    pofile.write(u"#: %s\n" % "\n#: ".join("%s:%s" %
                         (path.relpath(source, self.outdir), line)
                         for source, line, _ in positions))
                     # generate "# uuid1\n# uuid2\n ..."