Drop document.settings.gettext_compact

This commit is contained in:
Takeshi KOMIYA committed 2018-03-30 13:06:11 +09:00
1 parent 39ce9d9ab9
commit 962b6d459e
4 files changed
+8 -3

No files matched your search

+2
View File
@@ -15,6 +15,8 @@ Incompatible changes
* The default value of :confval:`epub_author` and :confval:`epub_publisher` are
changed from ``'unknown'`` to the value of :confval:`author`. This is same as
a ``conf.py`` file sphinx-build generates.
* The ``gettext_compact`` attribute is removed from ``document.settings``
object. Please use ``config.gettext_compact`` instead.
Deprecated
----------
+5
View File
@@ -269,6 +269,11 @@ The following is a list of deprecated interface.
- 2.0
- :meth:`~sphinx.application.Sphinx.add_stylesheet()`
* - ``document.settings.gettext_compact``
- 1.8
- 1.8
- :confval:`gettext_compact`
* - ``Sphinx.status_iterator()``
- 1.6
- 1.7
-1
View File
@@ -540,7 +540,6 @@ class BuildEnvironment(object):
"""Update settings by new config."""
self.settings['input_encoding'] = config.source_encoding
self.settings['trim_footnote_reference_space'] = config.trim_footnote_reference_space
self.settings['gettext_compact'] = config.gettext_compact
self.settings['language_code'] = config.language or 'en'
# Allow to disable by 3rd party extension (workaround)
+1 -2
View File
@@ -92,8 +92,7 @@ class Locale(SphinxTransform):
assert source.startswith(self.env.srcdir)
docname = path.splitext(relative_path(path.join(self.env.srcdir, 'dummy'),
source))[0]
textdomain = find_catalog(docname,
self.document.settings.gettext_compact)
textdomain = find_catalog(docname, self.config.gettext_compact)
# fetch translations
dirs = [path.join(self.env.srcdir, directory)