Skip to content

gh-129646: Update the locale alias mapping #129647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 4, 2025

Conversation

serhiy-storchaka
Copy link
Member

@serhiy-storchaka serhiy-storchaka commented Feb 4, 2025

@malemburg
Copy link
Member

Thanks, @serhiy-storchaka

Some of the edits made by the script are a bit odd. E.g. "de_li.utf8" is being removed, even though the original file still lists it: https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/master/nls/locale.alias.pre?ref_type=heads#L266

@serhiy-storchaka
Copy link
Member Author

This is because "de_li" was added. The mapping does not contain all data from locale.alias if it can safely be derived. normalize() takes the mapping for "de_li" ("de_LI.ISO8859-1") and replaces encoding "ISO8859-1" with "utf8". It makes the mapping twice or more less.

@malemburg
Copy link
Member

Ah, yes, you're right.

Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM

@malemburg malemburg merged commit f61afca into python:main Feb 4, 2025
43 checks passed
@miss-islington-app
Copy link

Thanks @serhiy-storchaka for the PR, and @malemburg for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 4, 2025
* pythongh-129646: Update the locale alias mapping

* Add a NEWS file.
(cherry picked from commit f61afca)

Co-authored-by: Serhiy Storchaka <[email protected]>
@bedevere-app
Copy link

bedevere-app bot commented Feb 4, 2025

GH-129658 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 Feb 4, 2025
@malemburg
Copy link
Member

Thanks, @serhiy-storchaka

serhiy-storchaka added a commit that referenced this pull request Feb 4, 2025
)

(cherry picked from commit f61afca)

Co-authored-by: Serhiy Storchaka <[email protected]>
@serhiy-storchaka serhiy-storchaka deleted the locale-aliases branch February 4, 2025 16:31
@serhiy-storchaka
Copy link
Member Author

Thanks for merging, but please don't forget to edit commit messages.

@malemburg
Copy link
Member

I haven't done this in CPython in a longer while. Can you point me to documentation about the needed edits ?

@malemburg
Copy link
Member

I found this reference: https://devguide.python.org/getting-started/git-boot-camp/#accepting-and-merging-a-pull-request and it appears you are referring to the changing the way Github issues and PRs are referenced (using "GH-" instead of "#").

@serhiy-storchaka
Copy link
Member Author

No, I meant that since the NEWS file was added in a separate commit, GitHub combined commit messages of several commit in a commit message of the merged commit. See f61afca. It contains a duplicate of the title of the original commit message and the commit message of the following commit. In worst cases (e.g. 4f82621) it can contain tens of useless lines that reflect the history of editing the PR, and not its final form. This is why we need to edit commit message before confirming merging.

@malemburg
Copy link
Member

Ah, ok, I see. Yes, I should have taken a closer look before hitting merge. Will do next time.

srinivasreddy pushed a commit to srinivasreddy/cpython that referenced this pull request Feb 7, 2025
* pythongh-129646: Update the locale alias mapping

* Add a NEWS file.
cmaloney pushed a commit to cmaloney/cpython that referenced this pull request Feb 8, 2025
* pythongh-129646: Update the locale alias mapping

* Add a NEWS file.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants