diff --git a/sphinx/config.py b/sphinx/config.py index 5f92479d3..7afb65eb3 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -163,6 +163,12 @@ class Config: raise ConfigError(__("config directory doesn't contain a conf.py file (%s)") % confdir) 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 {}) def convert_overrides(self, name: str, value: Any) -> Any: