From ef3a1f7b2e49e8f850e92fe358ee723f4f59dadc Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Mon, 16 Mar 2015 22:03:21 +0900 Subject: [PATCH] Fixed #1771: automated .mo building doesn't work properly with: * `gettext_compact=True` in conf.py * `sphinx-build -a` to rebuild all files. * `sphinx-build ... ` to specify docnames. --- CHANGES | 1 + sphinx/builders/__init__.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index b23b1cc97..0947b03ce 100644 --- a/CHANGES +++ b/CHANGES @@ -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) diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py index 60fccf233..4e0a6cfce 100644 --- a/sphinx/builders/__init__.py +++ b/sphinx/builders/__init__.py @@ -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)