GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-101845: pyspecific: Fix i18n for availability directive by jeanas · Pull Request #101846 · python/cpython

Conversation

@jeanas

@jeanas jeanas commented Feb 12, 2023 •
edited by bedevere-bot
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor

If the directive has content, the previous code would nest paragraph nodes from that content inside a general paragraph node, which confuses Sphinx and leads it to drop the content when translating. Instead, use a container node for the body.

Also use set_source_info so that any warnings have location info.

  • Issue: Doc: content of availability directive lost in i18n #101845

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

christopheNan reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
@jeanas
pyspecific: Fix i18n for availability directive
6afb193
If the directive has content, the previous code would nest paragraph
nodes from that content inside a general paragraph node, which confuses
Sphinx and leads it to drop the content when translating. Instead, use a
container node for the body.

Also use set_source_info so that any warnings have location info.
@bedevere-bot bedevere-bot added the awaiting review label Feb 12, 2023
@bedevere-bot bedevere-bot mentioned this pull request Feb 12, 2023
Doc: content of availability directive lost in i18n #101845
Closed
@jeanas

jeanas commented Feb 12, 2023

Copy link
Copy Markdown
Contributor Author

cc @JulienPalard @christopheNan @eviau @tiran

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@jeanas

jeanas commented Feb 12, 2023

Copy link
Copy Markdown
Contributor Author

I guess this can skip NEWS?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@jeanas

jeanas commented Feb 12, 2023

Copy link
Copy Markdown
Contributor Author

Also CC @AA-Turner, maybe you want to take a look?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@arhadthedev arhadthedev added docs Documentation in the Doc dir skip news build The build process and cross-build labels Feb 12, 2023
JulienPalard
JulienPalard approved these changes Feb 12, 2023
View reviewed changes
@bedevere-bot bedevere-bot added awaiting merge and removed awaiting review labels Feb 12, 2023
@JulienPalard
JulienPalard merged commit 6ef6915 into python:main Feb 12, 2023
@bedevere-bot bedevere-bot removed the awaiting merge label Feb 12, 2023
@JulienPalard

JulienPalard commented Feb 12, 2023

Copy link
Copy Markdown
Member

I tested it on an english and a french build: it works as expected.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@jeanas
jeanas deleted the availability-i18n branch February 12, 2023 14:33
@jeanas

jeanas commented Feb 12, 2023

Copy link
Copy Markdown
Contributor Author

Thanks for merging!

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@jeanas

jeanas commented Feb 12, 2023

Copy link
Copy Markdown
Contributor Author

BTW, this needs to be backported, right?

christopheNan reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@JulienPalard

JulienPalard commented Feb 12, 2023

Copy link
Copy Markdown
Member

BTW, this needs to be backported, right?

Right.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@JulienPalard JulienPalard added the needs backport to 3.11 only security fixes label Feb 12, 2023
@miss-islington

miss-islington commented Feb 12, 2023

Copy link
Copy Markdown
Contributor

Thanks @jeanas for the PR, and @JulienPalard for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-bot

bedevere-bot commented Feb 12, 2023

Copy link
Copy Markdown

GH-101852 is a backport of this pull request to the 3.11 branch.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Feb 12, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 12, 2023
@jeanas @miss-islington
pythongh-101845: pyspecific: Fix i18n for availability directive (pyt…
6db46e9
…honGH-101846)

pyspecific: Fix i18n for availability directive

If the directive has content, the previous code would nest paragraph
nodes from that content inside a general paragraph node, which confuses
Sphinx and leads it to drop the content when translating. Instead, use a
container node for the body.

Also use set_source_info so that any warnings have location info.
(cherry picked from commit 6ef6915)

Co-authored-by: Jean Abou-Samra <[email protected]>
@JulienPalard

JulienPalard commented Feb 12, 2023

Copy link
Copy Markdown
Member

It'll need a backport to 3.10 too but will probabily not succeed automatically.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@JulienPalard JulienPalard added the needs backport to 3.10 label Feb 12, 2023
@miss-islington

miss-islington commented Feb 12, 2023

Copy link
Copy Markdown
Contributor

Thanks @jeanas for the PR, and @JulienPalard for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@miss-islington

miss-islington commented Feb 12, 2023

Copy link
Copy Markdown
Contributor

Sorry, @jeanas and @JulienPalard, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6ef6915d3530e844243893f91bf4bd702dfef570 3.10

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@miss-islington miss-islington assigned JulienPalard Feb 12, 2023
miss-islington added a commit that referenced this pull request Feb 12, 2023
@miss-islington @jeanas
gh-101845: pyspecific: Fix i18n for availability directive (GH-101846)
1b73683
pyspecific: Fix i18n for availability directive

If the directive has content, the previous code would nest paragraph
nodes from that content inside a general paragraph node, which confuses
Sphinx and leads it to drop the content when translating. Instead, use a
container node for the body.

Also use set_source_info so that any warnings have location info.
(cherry picked from commit 6ef6915)

Co-authored-by: Jean Abou-Samra <[email protected]>
carljm added a commit to carljm/cpython that referenced this pull request Feb 13, 2023
@carljm
Merge branch 'main' into inlinecomp2
ae0bd02
* main:
  pythongh-101810: Remove duplicated st_ino calculation (pythonGH-101811)
  pythongh-92547: Purge sqlite3_enable_shared_cache() detection from configure (python#101873)
  pythonGH-100987: Refactor `_PyInterpreterFrame` a bit, to assist generator improvement. (pythonGH-100988)
  pythonGH-87849: Simplify stack effect of SEND and specialize it for generators and coroutines. (pythonGH-101788)
  Correct trivial grammar in reset_mock docs (python#101861)
  pythongh-101845: pyspecific: Fix i18n for availability directive (pythonGH-101846)
  pythongh-89792: Limit test_tools freeze test build parallelism based on the number of cores (python#101841)
  pythongh-85984: Utilize new "winsize" functions from termios in pty tests. (python#101831)
  pythongh-89792: Prevent test_tools from copying 1000M of "source" in freeze test (python#101837)
  Fix typo in test_fstring.py (python#101823)
  pythonGH-101797: allocate `PyExpat_CAPI` capsule on heap (python#101798)
  pythongh-101390: Fix docs for `imporlib.util.LazyLoader.factory` to properly call it a class method (pythonGH-101391)
@ZeroIntensity ZeroIntensity removed the needs backport to 3.10 label Feb 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JulienPalard JulienPalard JulienPalard approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

@JulienPalard JulienPalard

Labels

build The build process and cross-build docs Documentation in the Doc dir skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

6 participants

@jeanas @JulienPalard @miss-islington @bedevere-bot @arhadthedev @ZeroIntensity
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.