Skip to content

ICU-23290 BRS 78.2: CLDR release-48-1-beta1 to ICU maint/maint-78 branch#3808

Merged
markusicu merged 3 commits intounicode-org:maint/maint-78from
pedberg-icu:ICU-23290-CLDR-48-1-beta1-to-ICU-maint-78-branch
Dec 19, 2025
Merged

ICU-23290 BRS 78.2: CLDR release-48-1-beta1 to ICU maint/maint-78 branch#3808
markusicu merged 3 commits intounicode-org:maint/maint-78from
pedberg-icu:ICU-23290-CLDR-48-1-beta1-to-ICU-maint-78-branch

Conversation

@pedberg-icu
Copy link
Contributor

@pedberg-icu pedberg-icu commented Dec 16, 2025

Integrate CLDR release-48-1-beta1 to ICU maint/maint-78 branch, in 3 commits:

  1. binary files generated from CLDR data
  2. source data/test files generated or copied from CLDR
  3. ICU code/test/tool mods

The CLDR tickets are listed as blockers in CLDR-19148, but the key fixed data issues that affect ICU are:

  • Add missing spaces in dateTimeFormats (for combining date & time) in zh_Hant, yue (caused parse issues); this required updating some tests.
  • Fix digits to be 2 for currency RSD (while keeping cashDigits=0).
  • Fix some problems in display. names for hour cycle types (key hc).
  • Fix incorrect bracketing of some characters in pa exemplars.

ALLOW_MANY_COMMITS=true

Checklist

  • Required: Issue filed: ICU-23290
  • 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

@pedberg-icu
Copy link
Contributor Author

pedberg-icu commented Dec 17, 2025

Note, this also passed C and J exhaustive tests run locally; I am also running them in GitHub, on my branch....
And that GitHub exhaustive pass also finished without errors.

markusicu
markusicu previously approved these changes Dec 17, 2025
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.

thanks!

@pedberg-icu pedberg-icu assigned markusicu and unassigned richgillam Dec 18, 2025
@markusicu
Copy link
Member

Hi @pedberg-icu could you please resolve the pom file conflict and ping us for re-approval?

srl295
srl295 previously approved these changes Dec 18, 2025
Copy link
Member

@srl295 srl295 left a comment

Choose a reason for hiding this comment

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

RSLGTM also

@mihnita mihnita dismissed stale reviews from srl295 and markusicu via 261de78 December 18, 2025 22:32
@mihnita mihnita force-pushed the ICU-23290-CLDR-48-1-beta1-to-ICU-maint-78-branch branch from 261de78 to 21bdd4c Compare December 18, 2025 22:48
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • icu4c/source/common/unicode/unistr.h is now changed in the branch
  • icu4c/source/data/misc/zoneinfo64.txt is now changed in the branch
  • icu4c/source/test/intltest/ustrtest.cpp is now changed in the branch
  • icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BO.res is no longer changed in the branch
  • icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BR.res is no longer changed in the branch
  • icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BZ.res is no longer changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@mihnita mihnita force-pushed the ICU-23290-CLDR-48-1-beta1-to-ICU-maint-78-branch branch from 21bdd4c to 3b9660b Compare December 18, 2025 22:51
@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

@pedberg-icu
Copy link
Contributor Author

pedberg-icu commented Dec 18, 2025

@eggrobin and @mihnita This PR is for CLDR integration, is not for collecting all items for the maintenance branch with different ticket numbers etc. Please make separate PRs to the maint branch for your changes.

@markusicu Was there some agreement or discussion about piling other maint branch updates for unrelated tickets into this PR? If so then I leave it to someone else to clean up the PR and fix everything. I was just signed up to resolve the one collision and then merge,

@markusicu
Copy link
Member

Hi @pedberg-icu we wanted to get the maintenance branch settled and didn't know if you were still available, so I asked Mihai to try to resolve the reported conflict in the pom file.

@pedberg-icu
Copy link
Contributor Author

pedberg-icu commented Dec 18, 2025

Hi @pedberg-icu we wanted to get the maintenance branch settled and didn't know if you were still available, so I asked Mihai to try to resolve the reported conflict in the pom file.

@markusicu I had left a note in the agenda before the ICU meeting that I would resolve the pom conflict this afternoon. However the 2 commits so far here by Robin/Mihai have nothing to do with the pom file or CLDR integration and are under different ticket numbers, that has turned this PR into a kind of mess, and there are mysterious new errors about appveyor unable to build non-mergeable PR etc. So I am no longer willing to fix this PR to resolve all of the issues (unless those commits are retracted). It would have been simple just to fix the pom conflict.

@markusicu
Copy link
Member

I know, sorry about that -- Mihai got himself tangled in some git pit of despair. He said he would get back to it once he gets home.

@mihnita
Copy link
Contributor

mihnita commented Dec 18, 2025 via email

@mihnita mihnita force-pushed the ICU-23290-CLDR-48-1-beta1-to-ICU-maint-78-branch branch from 3b9660b to 5a42b8b Compare December 19, 2025 00:58
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • icu4c/source/common/unicode/unistr.h is no longer changed in the branch
  • icu4c/source/data/misc/zoneinfo64.txt is no longer changed in the branch
  • icu4c/source/test/intltest/ustrtest.cpp is no longer changed in the branch
  • icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BO.res is now changed in the branch
  • icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BR.res is now changed in the branch
  • icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BZ.res is now changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@mihnita mihnita force-pushed the ICU-23290-CLDR-48-1-beta1-to-ICU-maint-78-branch branch from 702758b to 13cd144 Compare December 19, 2025 01:15
@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

@mihnita
Copy link
Contributor

mihnita commented Dec 19, 2025

OK, all good.
The exhaustive tests took a while...

I also started from a current, clean icu branch maint/main-78, cldr at release-48-1-beta1 tag and cldr-staging at release-48-1-beta1 tag.
And from there I did all the CLDR-to-ICU update process, following the docs, completely independent of Peter's commits and from this PR.

The files I got are binary identical with the ones in the PR.

So the history (3 commits) in this PR is clean, I am confident that files are also correct.

Sorry for the mess,
Mihai

@mihnita mihnita requested a review from markusicu December 19, 2025 02:57
@pedberg-icu
Copy link
Contributor Author

@mihnita, thanks!

Whoever merges, please use "Rebase and merge" without squashing to merge the 3 commits separately.

@mihnita mihnita force-pushed the ICU-23290-CLDR-48-1-beta1-to-ICU-maint-78-branch branch from 13cd144 to fef9903 Compare December 19, 2025 09:35
@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

@pedberg-icu
Copy link
Contributor Author

@mihnita @markusicu @srl295 Mihai, thanks for fixing this all up. This looks good to me now and looks identical to what Markus and Steven originally approved except for the resolution of the pom conflict; compared to my original version, that pom conflict resolution just changed icu4j.version from 78.1 to 78.2. I cannot approve this (since it is my own PR) but perhaps it cn be re-stamped by Markus or Steven... And then it can be merged by whoever approves it.

@mihnita
Copy link
Contributor

mihnita commented Dec 19, 2025

I approved, so it's green, if you want to go ahead.
But I am also "tainted" :-), I should not be able to review.

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.

thanks Mihai and Peter!!

@markusicu markusicu merged commit 7c0aebc into unicode-org:maint/maint-78 Dec 19, 2025
106 checks passed
@pedberg-icu pedberg-icu deleted the ICU-23290-CLDR-48-1-beta1-to-ICU-maint-78-branch branch December 19, 2025 19:18
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.

5 participants