IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1771: automated .mo building doesn't work properly with:

Browse Source 
* `gettext_compact=True` in conf.py
* `sphinx-build -a` to rebuild all files.
* `sphinx-build ... <docnames>` to specify docnames.
This commit is contained in:
shimizukawa 2015-03-16 22:03:21 +09:00
parent a94c40cbcf
commit ef3a1f7b2e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -13,6 +13,7 @@ Bugs fixed
Takayuki Hirai.
* #1777: Sphinx 1.3 can't load extra theme. Thanks to tell-k.
* #1776: ``source_suffix = ['.rst']`` cause unfriendly error on prior version.
* #1771: automated .mo building doesn't work properly.
Release 1.3 (released Mar 10, 2015)

6
sphinx/builders/__init__.py
View File

@ -168,7 +168,7 @@ class Builder(object):
def compile_all_catalogs(self):
catalogs = i18n.get_catalogs(
[path.join(self.srcdir, x) for x in self.config.locale_dirs],
self.config.language, True)
self.config.language, self.config.gettext_compact, True)
message = 'all of %d po files' % len(catalogs)
self.compile_catalogs(catalogs, message)
@ -181,7 +181,7 @@ class Builder(object):
specified_domains = set(map(to_domain, specified_files))
catalogs = i18n.get_catalogs(
[path.join(self.srcdir, x) for x in self.config.locale_dirs],
self.config.language, True)
self.config.language, self.config.gettext_compact, True)
catalogs = [f for f in catalogs if f.domain in specified_domains]
message = 'targets for %d po files that are specified' % len(catalogs)
self.compile_catalogs(catalogs, message)
@ -189,7 +189,7 @@ class Builder(object):
def compile_update_catalogs(self):
catalogs = i18n.get_catalogs(
[path.join(self.srcdir, x) for x in self.config.locale_dirs],
self.config.language)
self.config.language, self.config.gettext_compact)
message = 'targets for %d po files that are out of date' % len(catalogs)
self.compile_catalogs(catalogs, message)