Skip to content

Conversation

@StanFromIreland
Copy link
Member

@StanFromIreland StanFromIreland commented Nov 23, 2025

@hugovk hugovk merged commit 4fe6e81 into python:main Nov 23, 2025
41 checks passed
@miss-islington-app
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 23, 2025
…pythonGH-141882)

(cherry picked from commit 4fe6e81)

Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Nov 23, 2025

GH-141883 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Nov 23, 2025
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 23, 2025
…pythonGH-141882)

(cherry picked from commit 4fe6e81)

Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Nov 23, 2025

GH-141884 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Nov 23, 2025
@StanFromIreland StanFromIreland deleted the fix-translation-changespy branch November 23, 2025 17:30
hugovk pushed a commit that referenced this pull request Nov 23, 2025
GH-141882) (#141883)

Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>
hugovk pushed a commit that referenced this pull request Nov 23, 2025
GH-141882) (#141884)

Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>
{% trans %}Deprecated since version {deprecated}, will be removed in version {removed}{% endtrans %}
{% trans %}Deprecated since version {deprecated}, removed in version {removed}{% endtrans %}
{% trans %}Deprecated since version %s, will be removed in version %s{% endtrans %}
{% trans %}Deprecated since version %s, removed in version %s{% endtrans %}
Copy link
Member

Choose a reason for hiding this comment

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

This precludes the possibility of a translation that needs to reorder the clauses. Not being a linguist I'm not certain that that's a necessity, but it seems well within the realm of possibility.

Copy link
Member Author

Choose a reason for hiding this comment

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

It may be a possibility, however it may also be unnecessary. I think we should keep this simple fix for now, and if someone complains look into the hacky options.

Copy link
Member Author

Choose a reason for hiding this comment

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

I went through the languages on TX for the string, and all of them have the expected order.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants