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

Use locales as a default value of locale_dirs

Browse Source
This commit is contained in:
Takeshi KOMIYA 2016-04-25 10:39:25 +09:00
parent cfa50a4db7
commit e3def45ffe
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -5,6 +5,7 @@ Incompatible changes
-------------------- --------------------
* LaTeX package fancybox is not longer a dependency of sphinx.sty * LaTeX package fancybox is not longer a dependency of sphinx.sty
* Use ``'locales'`` as a default value of `locale_dirs`
Features added Features added
-------------- --------------

5
doc/config.rst
View File

@ -513,7 +513,10 @@ documentation on :ref:`intl` for details.
:file:`./locale/{language}/LC_MESSAGES/sphinx.mo`. The text domain of :file:`./locale/{language}/LC_MESSAGES/sphinx.mo`. The text domain of
individual documents depends on :confval:`gettext_compact`. individual documents depends on :confval:`gettext_compact`.
The default is ``[]``. The default is ``['locales']``.
.. versionchanged:: 1.5
Use ``locales`` directory as a default value
.. confval:: gettext_compact .. confval:: gettext_compact

2
sphinx/config.py
View File

@ -57,7 +57,7 @@ class Config(object):
today_fmt = (None, 'env', string_classes), today_fmt = (None, 'env', string_classes),
language = (None, 'env', string_classes), language = (None, 'env', string_classes),
locale_dirs = ([], 'env'), locale_dirs = (['locales'], 'env'),
figure_language_filename = (u'{root}.{language}{ext}', 'env', [str]), figure_language_filename = (u'{root}.{language}{ext}', 'env', [str]),
master_doc = ('contents', 'env'), master_doc = ('contents', 'env'),

2
tests/test_config.py
View File

@ -38,7 +38,7 @@ def test_core_config(app, status, warning):
# simple default values # simple default values
assert 'locale_dirs' not in cfg.__dict__ assert 'locale_dirs' not in cfg.__dict__
assert cfg.locale_dirs == [] assert cfg.locale_dirs == ['locales']
assert cfg.trim_footnote_reference_space is False assert cfg.trim_footnote_reference_space is False
# complex default values # complex default values