Commit1b73683

miss-islington

and

jeanas

authored

gh-101845: pyspecific: Fix i18n for availability directive (GH-101846)

pyspecific: Fix i18n for availability directiveIf the directive has content, the previous code would nest paragraphnodes from that content inside a general paragraph node, which confusesSphinx and leads it to drop the content when translating. Instead, use acontainer node for the body.Also use set_source_info so that any warnings have location info.(cherry picked from commit6ef6915)Co-authored-by: Jean Abou-Samra <jean@abou-samra.fr>

1 parentcec99ed commit1b73683Copy full SHA for 1b73683

File tree

1 file changed

+11

-9

lines changed

Doc/tools/extensions
- pyspecific.py

1 file changed

+11

-9

lines changed

`‎Doc/tools/extensions/pyspecific.py`

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`fromsphinx.environmentimportNoUri`
`29`	`29`	`fromsphinx.localeimport_assphinx_gettext`
`30`	`30`	`fromsphinx.utilimportstatus_iterator,logging`
	`31`	`+fromsphinx.util.docutilsimportSphinxDirective`
`31`	`32`	`fromsphinx.util.nodesimportsplit_explicit_title`
`32`	`33`	`fromsphinx.writers.textimportTextWriter,TextTranslator`
`33`	`34`	`fromsphinx.writers.lateximportLaTeXTranslator`
`@@ -124,7 +125,7 @@ def run(self):`
`124`	`125`
`125`	`126`	`# Support for documenting platform availability`
`126`	`127`
`127`		`-classAvailability(Directive):`
	`128`	`+classAvailability(SphinxDirective):`
`128`	`129`
`129`	`130`	`has_content=True`
`130`	`131`	`required_arguments=1`
`@@ -144,18 +145,19 @@ class Availability(Directive):`
`144`	`145`
`145`	`146`	`defrun(self):`
`146`	`147`	availability_ref=':ref:`Availability <availability>`: '
	`148`	`+avail_nodes,avail_msgs=self.state.inline_text(`
	`149`	`+availability_ref+self.arguments[0],`
	`150`	`+self.lineno)`
`147`	`151`	`pnode=nodes.paragraph(availability_ref+self.arguments[0],`
`148`		`-classes=["availability"],)`
`149`		`-n,m=self.state.inline_text(availability_ref,self.lineno)`
`150`		`-pnode.extend(n+m)`
`151`		`-n,m=self.state.inline_text(self.arguments[0],self.lineno)`
`152`		`-pnode.extend(n+m)`
	`152`	`+'',avail_nodes,avail_msgs)`
	`153`	`+self.set_source_info(pnode)`
	`154`	`+cnode=nodes.container("",pnode,classes=["availability"])`
	`155`	`+self.set_source_info(cnode)`
`153`	`156`	`ifself.content:`
`154`		`-self.state.nested_parse(self.content,self.content_offset,pnode)`
`155`		`-`
	`157`	`+self.state.nested_parse(self.content,self.content_offset,cnode)`
`156`	`158`	`self.parse_platforms()`
`157`	`159`
`158`		`-return [pnode]`
	`160`	`+return [cnode]`
`159`	`161`
`160`	`162`	`defparse_platforms(self):`
`161`	`163`	`"""Parse platform information from arguments`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit1b73683

File tree

1 file changed

1 file changed

`‎Doc/tools/extensions/pyspecific.py`

0 commit comments