55 lines
2.5 KiB
Diff
55 lines
2.5 KiB
Diff
|
From 5775f51691d7d64fb676586e008b41261ce64ac2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Matt.Wang" <mattwang44@gmail.com>
|
||
|
|
Date: Wed, 19 Oct 2022 14:49:08 +0800
|
||
|
|
Subject: [PATCH 1/2] fix(doc-tools): use sphinx.locale._ as gettext() for
|
||
|
|
backward-compatibility in pyspecific.py
|
||
|
|
|
||
|
|
[why] spinix 5.3 changed locale.translators from a defaultdict(gettext.NullTranslations) to a dict, which leads to failure of pyspecific.py. Use sphinx.locale._ as gettext to fix the issue.
|
||
|
|
---
|
||
|
|
Doc/tools/extensions/pyspecific.py | 8 ++++----
|
||
|
|
Misc/NEWS.d/next/Documentation/2022-10-19-07-15-52.gh-issue-98366.UskMXF.rst | 1 +
|
||
|
|
2 files changed, 5 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- a/Doc/tools/extensions/pyspecific.py
|
||
|
|
+++ b/Doc/tools/extensions/pyspecific.py
|
||
|
|
@@ -26,7 +26,7 @@ try:
|
||
|
|
from sphinx.errors import NoUri
|
||
|
|
except ImportError:
|
||
|
|
from sphinx.environment import NoUri
|
||
|
|
-from sphinx.locale import translators
|
||
|
|
+from sphinx.locale import _ as sphinx_gettext
|
||
|
|
from sphinx.util import status_iterator, logging
|
||
|
|
from sphinx.util.nodes import split_explicit_title
|
||
|
|
from sphinx.writers.text import TextWriter, TextTranslator
|
||
|
|
@@ -109,7 +109,7 @@ class ImplementationDetail(Directive):
|
||
|
|
def run(self):
|
||
|
|
self.assert_has_content()
|
||
|
|
pnode = nodes.compound(classes=['impl-detail'])
|
||
|
|
- label = translators['sphinx'].gettext(self.label_text)
|
||
|
|
+ label = sphinx_gettext(self.label_text)
|
||
|
|
content = self.content
|
||
|
|
add_text = nodes.strong(label, label)
|
||
|
|
self.state.nested_parse(content, self.content_offset, pnode)
|
||
|
|
@@ -257,7 +257,7 @@ class AuditEvent(Directive):
|
||
|
|
else:
|
||
|
|
args = []
|
||
|
|
|
||
|
|
- label = translators['sphinx'].gettext(self._label[min(2, len(args))])
|
||
|
|
+ label = sphinx_gettext(self._label[min(2, len(args))])
|
||
|
|
text = label.format(name="``{}``".format(name),
|
||
|
|
args=", ".join("``{}``".format(a) for a in args if a))
|
||
|
|
|
||
|
|
@@ -436,7 +436,7 @@ class DeprecatedRemoved(Directive):
|
||
|
|
else:
|
||
|
|
label = self._removed_label
|
||
|
|
|
||
|
|
- label = translators['sphinx'].gettext(label)
|
||
|
|
+ label = sphinx_gettext(label)
|
||
|
|
text = label.format(deprecated=self.arguments[0], removed=self.arguments[1])
|
||
|
|
if len(self.arguments) == 3:
|
||
|
|
inodes, messages = self.state.inline_text(self.arguments[2],
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/Misc/NEWS.d/next/Documentation/2022-10-19-07-15-52.gh-issue-98366.UskMXF.rst
|
||
|
|
@@ -0,0 +1 @@
|
||
|
|
+Use sphinx.locale._ as the gettext function in pyspecific.py.
|