FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-113637: Let c_annotations.py to handle the spacing of Limited/Unstable API & Stable ABI translation strings by egeakman · Pull Request #113638 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-113637: Let c_annotations.py to handle the spacing of Limited/Unstable API & Stable ABI translation strings - #113638

Merged
hugovk merged 3 commits into
python:mainfrom
egeakman:c-annotations-whitespace
Jan 3, 2024
ConversationCommits (3)ChecksFiles changed
Merged

gh-113637: Let c_annotations.py to handle the spacing of Limited/Unstable API & Stable ABI translation strings#113638
hugovk merged 3 commits into
python:mainfrom
egeakman:c-annotations-whitespace

Conversation

egeakman commented Jan 1, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

I've removed the hardcoded leading and trailing whitespaces in the template file, now c_annotations.py handles them.

  • For Part of the: We add one leading and one trailing space to the translated string
  • For This is: We add a trailing space
  • For the rest of the translated strings: We add a leading space

This makes the translations easier and less error-prone to unwanted concatenations.

See also: #107680 (comment)

CC: @AA-Turner and @hugovk

Here is how it looks in the preview:

  • English (RTD preview):


  • Turkish (local build):


📚 Documentation preview 📚: https://cpython-previews--113638.org.readthedocs.build/

bedevere-app Bot commented Jan 1, 2024

Copy link
Copy Markdown

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

bedevere-app Bot mentioned this pull request Jan 1, 2024
Closed

bedevere-app Bot commented Jan 1, 2024

Copy link
Copy Markdown

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

bedevere-app Bot commented Jan 2, 2024

Copy link
Copy Markdown

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

hugovk added skip news needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Jan 2, 2024
hugovk approved these changes Jan 2, 2024
View reviewed changes

hugovk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Thank you!

egeakman commented Jan 2, 2024

Copy link
Copy Markdown
Contributor Author

@hugovk Would you like me to update the branch? No conflicts though.

hugovk commented Jan 2, 2024

Copy link
Copy Markdown
Member

No need to update unless there are some special changes we need from main (or the branch gets really old and we want to make sure CI still passes).

We can merge this tomorrow if there are no objections.

hugovk merged commit ea978c6 into python:main Jan 3, 2024

miss-islington-app Bot commented Jan 3, 2024

Copy link
Copy Markdown

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 3, 2024
pythongh-113637: Let c_annotations.py to handle the spacing of Limite…
3090164 
…d/Unstable API & Stable ABI translation strings (pythonGH-113638)

(cherry picked from commit ea978c6)

Co-authored-by: Ege Akman <egeakmanegeakman@hotmail.com>

miss-islington-app Bot commented Jan 3, 2024

Copy link
Copy Markdown

Sorry, @egeakman and @hugovk, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker ea978c645edd7bc29d811c61477dff766d7318b6 3.11

bedevere-app Bot commented Jan 3, 2024

Copy link
Copy Markdown

GH-113676 is a backport of this pull request to the 3.12 branch.

bedevere-app Bot removed the needs backport to 3.12 only security fixes label Jan 3, 2024

hugovk commented Jan 3, 2024

Copy link
Copy Markdown
Member

@egeakman Would you like to have a go doing the 3.11 backport? Let me know if you've any questions, and I'm happy to do it too.

egeakman added a commit to egeakman/cpython that referenced this pull request Jan 3, 2024
[3.11] pythongh-113637: Let c_annotations.py to handle the spacing of…
6a76d9d 
… Limited/Unstable API & Stable ABI translation strings (python#113638)

(cherry picked from commit ea978c6)

bedevere-app Bot commented Jan 3, 2024

Copy link
Copy Markdown

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

bedevere-app Bot removed the needs backport to 3.11 only security fixes label Jan 3, 2024
hugovk pushed a commit that referenced this pull request Jan 3, 2024
[3.12] gh-113637: Let c_annotations.py to handle the spacing of Limit…
5f3fe84 
…ed/Unstable API & Stable ABI translation strings (GH-113638) (#113676)

Co-authored-by: Ege Akman <egeakmanegeakman@hotmail.com>
hugovk pushed a commit that referenced this pull request Jan 3, 2024
[3.11] gh-113637: Let c_annotations.py to handle the spacing of Limit…
d4a28ec 
…ed/Unstable API & Stable ABI translation strings (#113638) (#113679)
egeakman deleted the c-annotations-whitespace branch January 3, 2024 13:09
kulikjak pushed a commit to kulikjak/cpython that referenced this pull request Jan 22, 2024
pythongh-113637: Let c_annotations.py to handle the spacing of Limite…
d2ab797 
…d/Unstable API & Stable ABI translation strings (python#113638)
aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
pythongh-113637: Let c_annotations.py to handle the spacing of Limite…
a642c00 
…d/Unstable API & Stable ABI translation strings (python#113638)
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
pythongh-113637: Let c_annotations.py to handle the spacing of Limite…
872fe5b 
…d/Unstable API & Stable ABI translation strings (python#113638)
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

hugovk hugovk approved these changes

Assignees

hugovk

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

Back | FazBrowse Home | New Git URL