summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2020-06-03 11:42:42 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-06-03 11:43:37 +0200
commite260dec258d58a30db2d870d019620b00d05a421 (patch)
treed3b49b4f014cbe31dca73c16c8c9ce8731b612ef
parentd193aa8da6687d0fdc912fae6e9c316c2531b8b8 (diff)
[3.1.x] Made default_role_error use logger.
This prevents raising errors for translated docs, see https://github.com/django/djangoproject.com/issues/997 Follow up to 1cdfe8d91215eefaa18c398069dd9c6879a9511d. Backport of 36a2e9607e3069e875eedfd814d4473d9b6811cb from master
-rw-r--r--docs/_ext/djangodocs.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
index 094741d952..b21cfebc9e 100644
--- a/docs/_ext/djangodocs.py
+++ b/docs/_ext/djangodocs.py
@@ -12,9 +12,9 @@ from sphinx import addnodes
from sphinx.builders.html import StandaloneHTMLBuilder
from sphinx.directives.code import CodeBlock
from sphinx.domains.std import Cmdoption
-from sphinx.errors import ExtensionError, SphinxError
+from sphinx.errors import ExtensionError
from sphinx.util import logging
-from sphinx.util.console import bold, red
+from sphinx.util.console import bold
from sphinx.writers.html import HTMLTranslator
logger = logging.getLogger(__name__)
@@ -378,8 +378,9 @@ def default_role_error(
name, rawtext, text, lineno, inliner, options=None, content=None
):
msg = (
- "Default role used (`single backticks`) at line %s: %s. Did you mean "
- "to use two backticks for ``code``, or miss an underscore for a "
- "`link`_ ?" % (lineno, rawtext)
+ "Default role used (`single backticks`): %s. Did you mean to use two "
+ "backticks for ``code``, or miss an underscore for a `link`_ ?"
+ % rawtext
)
- raise SphinxError(red(msg))
+ logger.warning(msg, location=(inliner.document.current_source, lineno))
+ return [nodes.Text(text)], []