Skip to content
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

CLDR-17111 Deprecate old style zone IDs (e.g. EST5EDT, EET) #3754

Merged
merged 1 commit into from
Jul 24, 2024

Conversation

justingrant
Copy link
Contributor

@justingrant justingrant commented May 27, 2024

CLDR-17111

  • This PR completes the ticket.

ALLOW_MANY_COMMITS=true

This PR revises changes from #3736 (cc @yumaoka) to align CLDR's aliases for recently deprecated zones to match IANA's Link=>Zone mappings in the following recent commits:

eggert/tz@782d082
eggert/tz@a0b09c0

It also fixes tests broken by these deprecations.

@justingrant justingrant changed the title Deprecate old style zone IDs (e.g. EST5EDT, EET) CLDR-17111: Deprecate old style zone IDs (e.g. EST5EDT, EET) May 27, 2024
@justingrant justingrant changed the title CLDR-17111: Deprecate old style zone IDs (e.g. EST5EDT, EET) CLDR-17111 Depr by ecate old style zone IDs (e.g. EST5EDT, EET) May 27, 2024
@justingrant justingrant changed the title CLDR-17111 Depr by ecate old style zone IDs (e.g. EST5EDT, EET) CLDR-17111 Deprecate old style zone IDs (e.g. EST5EDT, EET) May 27, 2024
@yumaoka
Copy link
Member

yumaoka commented May 28, 2024

The changes look fine. All changes are aligned to what IANA TZ database maintainer agreed with.
Because you already have the correct changes, I'll close my PRs previously created.

For ICU testing - we'll find out if there are any changes required on ICU side after this is merged. I don't think CLDR test fails with this change.

@yumaoka yumaoka self-requested a review May 28, 2024 20:15
Copy link
Member

@yumaoka yumaoka left a comment

Choose a reason for hiding this comment

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

Confirmed all changes are aligned to what IANA TZ database maintainer agreed with.

@justingrant
Copy link
Contributor Author

The changes look fine. All changes are aligned to what IANA TZ database maintainer agreed with. Because you already have the correct changes, I'll close my PRs previously created.

Great! Glad we were able to resolve this upstream. Easier for everyone.

For ICU testing - we'll find out if there are any changes required on ICU side after this is merged. I don't think CLDR test fails with this change.

Yep, fixing the CLDR tests was thankfully easy: it only required adding EST5EDT, etc. zones to the deprecated-zone exception list in TestLocale.java. I can confirm that tests failed before this test-code change and passed afterwards.

@yumaoka
Copy link
Member

yumaoka commented Jul 17, 2024

@justingrant Are you waiting for someone to merge this? There is an issues in this PR. First, you have a commit with a comment not starting with CLDR-17111. Can you fix this? It is not a requirement to squash changes into one, but for this change, it's probably a good idea to do so.

If you are not able to do this, I can create a separate PR and merge it. I cannot modify the branch, so that's only the solution if you're not going to correct PR issues and merge it.

@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • common/supplemental/supplementalMetadata.xml is different
  • tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestLocale.java is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

* Following upstream IANA changes, deprecate old IDs like EST5EDT and
  EET, and make them aliases. Mappings are updated to match these IANA
  commits:

eggert/tz@782d082
eggert/tz@a0b09c0

* Fix timezone tests to handle newly-deprecated zones est5edt, cst6cdt,
  mst7mdt, and pst8pdt.
@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@justingrant
Copy link
Contributor Author

@justingrant Are you waiting for someone to merge this?

Yep! Also, I don't have permissions to run the GH build and test actions so someone will need to run those.

you have a commit with a comment not starting with CLDR-17111

Fixed!

not a requirement to squash changes into one, but for this change, it's probably a good idea to do so.

Sqaushed and rebased to main.

Let me know if there's anything more that I need to do. Thanks @yumaoka!

@yumaoka yumaoka merged commit 8612b92 into unicode-org:main Jul 24, 2024
12 checks passed
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.

2 participants