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

Merge pull request #4945 from zhsj/fix-search-lang

Browse Source 
fix lang_COUNTRY not fallback correctly for IndexBuilder
This commit is contained in:
Takayuki SHIMIZUKAWA 2018-05-12 16:54:33 +09:00 committed by GitHub
commit a9e66bc447
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -105,6 +105,7 @@ Bugs fixed
* i18n: message catalogs were reset on each initialization
* #4850: latex: footnote inside footnote was not rendered
* i18n: fix lang_COUNTRY not fallback correctly for IndexBuilder
Testing
--------

4
sphinx/builders/html.py
View File

@ -444,9 +444,9 @@ class StandaloneHTMLBuilder(Builder):
# create the search indexer
self.indexer = None
if self.search:
from sphinx.search import IndexBuilder, languages
from sphinx.search import IndexBuilder
lang = self.config.html_search_language or self.config.language
if not lang or lang not in languages:
if not lang:
lang = 'en'
self.indexer = IndexBuilder(self.env, lang,
self.config.html_search_options,