Skip to content

Conversation

@robertbastian
Copy link
Member

@robertbastian robertbastian commented Nov 28, 2025

Updated ldml2icu_supplemental.txt and ran steps 5b and 12 of the integration checklist.

Checklist

  • Required: Issue filed: ICU-23278
  • Required: The PR title must be prefixed with a JIRA Issue number. Example: "ICU-NNNNN Fix xyz"
  • Required: Each commit message must be prefixed with a JIRA Issue number. Example: "ICU-NNNNN Fix xyz"
  • Issue accepted (done by Technical Committee after discussion)
  • Tests included, if applicable
  • API docs and/or User Guide docs changed or added, if applicable
  • Approver: Feel free to merge on my behalf

@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • icu4c/source/common/ucasemap.cpp is now changed in the branch
  • icu4c/source/data/misc/metaZones.txt is now changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@robertbastian robertbastian changed the base branch from main to maint/maint-78 December 1, 2025 11:27
@robertbastian robertbastian marked this pull request as ready for review December 1, 2025 11:28
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metaZones.res is now changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@markusicu
Copy link
Member

Thanks for this pull request!
Does it fully fix the problem? Or do we need to regenerate the locale data with display names?
(Hard to verify without specific added or changed unit tests.)

@robertbastian
Copy link
Member Author

This fully fixes the problem. The display name for the GMT meta zone already needs to be in the data for other zones.

Where should a unit test go?

@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • icu4c/source/test/intltest/tztest.cpp is now changed in the branch
  • icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java is now changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@robertbastian
Copy link
Member Author

Ok I've written two unit tests, however these don't seem to fail without the fix. I suspect it might use the file at icu4c/source/test/testdata/metaZones.txt which hasn't been updated in 9 years and therefore doesn't have the issue, or I'm just running the tests wrong (I'm just doing make check).

@markusicu markusicu self-assigned this Dec 4, 2025
@markusicu
Copy link
Member

@roubert or @FrankYFTang could you please see whether the fuzzer failure is real and related to these changes? seems unlikely but blocks this PR :-(
https://github.com/unicode-org/icu/actions/runs/19858467913?pr=3784

@FrankYFTang
Copy link
Contributor

I do not believe the fuzzer breakage is realted to this PR. I filed another bug https://unicode-org.atlassian.net/browse/ICU-23283 to look into that.

@FrankYFTang
Copy link
Contributor

I build the fuzzer in trunk w/ the patch and run the fuzzer and cnnot reproduce the issue. Try to run it on branch in action w/o the PR now

@FrankYFTang
Copy link
Contributor

ok, I think what happen is that issue is fixed by me on 59577f6 but that is not in the branch

@FrankYFTang
Copy link
Contributor

somehow I cannot reproduce the fuzzer issue on https://github.com/unicode-org/icu/actions/runs/19944874424

@markusicu
Copy link
Member

Hi @robertbastian -- Frank's fix is now cherry-picked onto the maintenance branch. Please rebase this PR, which should get CI to pass, and then you should be able to merge.

@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

Copy link
Member

@markusicu markusicu left a comment

Choose a reason for hiding this comment

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

CI checks pass!
@robertbastian please merge. (You didn't check the Feel free to merge on my behalf box :-)

@robertbastian robertbastian merged commit 019c72b into maint/maint-78 Dec 9, 2025
106 checks passed
@robertbastian robertbastian deleted the exuberant-raccoon branch December 9, 2025 09:21
@echeran echeran mentioned this pull request Dec 9, 2025
7 tasks
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.

4 participants