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

Resolve issue 10474

Browse Source
This commit is contained in:
Adam Turner 2022-05-27 23:42:00 +01:00
parent 092c29e025
commit 39916e6ed3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sphinx/config.py
View File

@ -163,6 +163,12 @@ class Config:
raise ConfigError(__("config directory doesn't contain a conf.py file (%s)") % raise ConfigError(__("config directory doesn't contain a conf.py file (%s)") %
confdir) confdir)
namespace = eval_config_file(filename, tags) namespace = eval_config_file(filename, tags)
# Resolve https://github.com/sphinx-doc/sphinx/issues/10474 where conf.py
# explicitly sets language to None, by coercing it to English.
if namespace["language"] is None:
namespace["language"] = "en"
return cls(namespace, overrides or {}) return cls(namespace, overrides or {})
def convert_overrides(self, name: str, value: Any) -> Any: def convert_overrides(self, name: str, value: Any) -> Any: