gh-101845: pyspecific: Fix i18n for availability directive#101846
Merged
Uh oh!
There was an error while loading. Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
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.
ContributorAuthor
jeanas commented Feb 12, 2023
ContributorAuthor
jeanas commented Feb 12, 2023
I guess this can skip NEWS? |
ContributorAuthor
jeanas commented Feb 12, 2023
Also CC @AA-Turner, maybe you want to take a look? |
arhadthedev added docs 
JulienPalard approved these changes Feb 12, 2023
Member
JulienPalard commented Feb 12, 2023
I tested it on an english and a french build: it works as expected. |
ContributorAuthor
jeanas commented Feb 12, 2023
Thanks for merging! |
ContributorAuthor
jeanas commented Feb 12, 2023
BTW, this needs to be backported, right? |
Member
JulienPalard commented Feb 12, 2023
Right. |
Contributor
miss-islington commented Feb 12, 2023
Thanks @jeanas for the PR, and @JulienPalard for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11. |
bedevere-bot commented Feb 12, 2023
GH-101852 is a backport of this pull request to the 3.11 branch. |
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 12, 2023
…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 <jean@abou-samra.fr>
Member
JulienPalard commented Feb 12, 2023
It'll need a backport to 3.10 too but will probabily not succeed automatically. |
Contributor
miss-islington commented Feb 12, 2023
Thanks @jeanas for the PR, and @JulienPalard for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10. |
Contributor
miss-islington commented Feb 12, 2023
Sorry, @jeanas and @JulienPalard, I could not cleanly backport this to |
miss-islington added a commit that referenced this pull request Feb 12, 2023
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 <jean@abou-samra.fr>
carljm added a commit to carljm/cpython that referenced this pull request Feb 13, 2023
* 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)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment
6 participants
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.
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.