From 48181db0d8d9d7752b5f59366ea9f60d729abf20 Mon Sep 17 00:00:00 2001 From: Anthony MOI Date: Mon, 2 Nov 2020 11:01:50 -0500 Subject: [PATCH] Doc - Fix entity warnings when no language tag was specified --- docs/source/_ext/entities.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/docs/source/_ext/entities.py b/docs/source/_ext/entities.py index 8e533354..43549893 100644 --- a/docs/source/_ext/entities.py +++ b/docs/source/_ext/entities.py @@ -211,14 +211,22 @@ def process_entity_nodes(app, doctree, docname): entities = AllEntities.install(env) entities.resolve_pendings(app) - language = next(l for l in LANGUAGES if l in app.tags) + language = None + try: + language = next(l for l in LANGUAGES if l in app.tags) + except Exception: + logger.warning(f"No language tag specified, not resolving entities in {docname}") + for node in doctree.traverse(EntityNode): - entity = entities.get(language, node.entity, docname) - if entity is None: + if language is None: node.replace_self(nodes.Text(_(node.entity), _(node.entity))) - logger.warning(f'Entity "{node.entity}" has not been defined', location=node) else: - node.replace_self(entity["content"]) + entity = entities.get(language, node.entity, docname) + if entity is None: + node.replace_self(nodes.Text(_(node.entity), _(node.entity))) + logger.warning(f'Entity "{node.entity}" has not been defined', location=node) + else: + node.replace_self(entity["content"]) def purge_entities(app, env, docname):