Anonymous avatar Anonymous committed 566bb9f

[i18n] use relative path from output directory for source path.

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

The commit says "Refactor" but it changes original code behavior.
In original code, start path for path.relpath() is self.outdir but
in refactored code, start path for path.relpath() is self.srcdir.

It should be self.outdir not self.srcdir to improve po-mode.el
support. po-mode.el has "po-cycle-source-reference" command. It
search source code relative from .po file directory.

See also::
http://www.gnu.org/s/hello/manual/gettext/C-Sources-Context.html

Program source files are usually found relative to where the PO
file stands. As a special provision, when this fails, the file
is also looked for, but relative to the directory immediately
above it.

Comments (1)

Files changed (1)

sphinx/builders/gettext.py

 
                     # generate "#: file1:line1 file2:line2 ..."
                     pofile.write(u"#: %s\n" % ", ".join("%s:%s" %
-                        (path.relpath(source, self.srcdir), line)
+                        (path.relpath(source, self.outdir), line)
                         for source, line, _ in positions))
                     # generate "# uuid1\n# uuid2\n ..."
                     pofile.write(u"# %s\n" % "\n# ".join(uid for _, _, uid
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.