diff --git a/sphinx/builders/html/__init__.py b/sphinx/builders/html/__init__.py index a62e46b43..7244a3c4e 100644 --- a/sphinx/builders/html/__init__.py +++ b/sphinx/builders/html/__init__.py @@ -1140,7 +1140,7 @@ def convert_html_js_files(app: Sphinx, config: Config) -> None: config.html_js_files = html_js_files # type: ignore -def setup_js_tag_helper(app: Sphinx, pagename: str, templatexname: str, +def setup_js_tag_helper(app: Sphinx, pagename: str, templatename: str, context: Dict, doctree: Node) -> None: """Set up js_tag() template helper. diff --git a/sphinx/util/i18n.py b/sphinx/util/i18n.py index d647d6d05..1e469d135 100644 --- a/sphinx/util/i18n.py +++ b/sphinx/util/i18n.py @@ -116,11 +116,11 @@ class CatalogRepository: yield CatalogInfo(basedir, domain, self.encoding) -def docname_to_domain(docname: str, compation: Union[bool, str]) -> str: +def docname_to_domain(docname: str, compaction: Union[bool, str]) -> str: """Convert docname to domain for catalogs.""" - if isinstance(compation, str): - return compation - if compation: + if isinstance(compaction, str): + return compaction + if compaction: return docname.split(SEP, 1)[0] else: return docname