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

Fix #4169: Chinese language doesn't trigger Chinese search automatically

Browse Source
This commit is contained in:
Takeshi KOMIYA 2017-10-21 01:42:53 +09:00
parent 77e673d08c
commit 4448902977
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -31,6 +31,7 @@ Bugs fixed
* #3692: Unable to build HTML if writing .buildinfo failed * #3692: Unable to build HTML if writing .buildinfo failed
* #4152: HTML writer crashes if a field list is placed on top of the document * #4152: HTML writer crashes if a field list is placed on top of the document
* #4063: Sphinx crashes when labeling directive ``.. todolist::`` * #4063: Sphinx crashes when labeling directive ``.. todolist::``
* #4169: Chinese language doesn't trigger Chinese search automatically
Testing Testing
-------- --------

5
sphinx/search/__init__.py
View File

@ -265,6 +265,11 @@ class IndexBuilder(object):
# objtype index -> (domain, type, objname (localized)) # objtype index -> (domain, type, objname (localized))
lang_class = languages.get(lang) # type: Type[SearchLanguage] lang_class = languages.get(lang) # type: Type[SearchLanguage]
# add language-specific SearchLanguage instance # add language-specific SearchLanguage instance
# fallback; try again with language-code
if lang_class is None and '_' in lang:
lang_class = languages.get(lang.split('_')[0])
if lang_class is None: if lang_class is None:
self.lang = SearchEnglish(options) # type: SearchLanguage self.lang = SearchEnglish(options) # type: SearchLanguage
elif isinstance(lang_class, str): elif isinstance(lang_class, str):

12
tests/test_search.py
View File

@ -228,3 +228,15 @@ def test_IndexBuilder():
} }
assert index._objtypes == {('dummy', 'objtype'): 0} assert index._objtypes == {('dummy', 'objtype'): 0}
assert index._objnames == {0: ('dummy', 'objtype', 'objtype')} assert index._objnames == {0: ('dummy', 'objtype', 'objtype')}
def test_IndexBuilder_lookup():
env = DummyEnvironment('1.0', {})
# zh
index = IndexBuilder(env, 'zh', {}, None)
assert index.lang.lang == 'zh'
# zh_CN
index = IndexBuilder(env, 'zh_CN', {}, None)
assert index.lang.lang == 'zh'