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.

Sign up for GitHub

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

ICU-22583 CLDR release-44-1 to ICU maint/maint-74 branch #2727

Merged
merged 4 commits into from
Dec 7, 2023
Merged

ICU-22583 CLDR release-44-1 to ICU maint/maint-74 branch #2727

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6b5f72
ICU-22583 CLDR release-44-1 to ICU maint/maint-74 part 1 (binaries, b…
pedberg-icu Dec 7, 2023
5a60769
ICU-22583 CLDR release-44-1 to ICU maint/maint-74 part 2 (data genera…
pedberg-icu Dec 7, 2023
4f3c83f
ICU-22583 CLDR release-44-1 to ICU maint/maint-74 part 3 (ICU sources…
pedberg-icu Dec 7, 2023
86d88d1
ICU-22583 CLDR release-44-1 to ICU maint/maint-74 part 4 (Restore kxv…
pedberg-icu Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion icu4c/source/test/cintltst/creststn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2181,7 +2181,7 @@ static void TestFallback()
UResourceBundle* myResB = ures_open(NULL,"no_NO_NY",&err);
UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err);
const UChar* version = NULL;
static const UChar versionStr[] = u"44"; // 44 in nn_NO or in a parent bundle/root
static const UChar versionStr[] = u"44.1"; // 44.1 in nn_NO or in a parent bundle/root

if(U_FAILURE(err)) {
log_data_err("Expected success when trying to test no_NO_NY aliased to nn_NO for Version "
Expand Down
4 changes: 2 additions & 2 deletions icu4c/source/test/testdata/root.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
root
{
Version { 44.0 }
ExpectCLDRVersionAtLeast { 44.0 } // 'base' cldr version. Allow up to version =.=.* of this
CurrentCLDRVersion { 44.0 } // Current CLDR version as of the test update. Warn if not an exact match.
ExpectCLDRVersionAtLeast { 44.1 } // 'base' cldr version. Allow up to version =.=.* of this
CurrentCLDRVersion { 44.1 } // Current CLDR version as of the test update. Warn if not an exact match.

ShortLanguage { xxx }

Expand Down
2 changes: 1 addition & 1 deletion tools/cldr/cldr-to-icu/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>74.1-SNAPSHOT</version>
<version>74.1</version>
Copy link
Member

Choose a reason for hiding this comment

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

How is this version number used?
Does it matter that it's at 74.1 now but we are about to release 74.2?
Does it matter that #2728 does not touch this version number?

@pedberg-icu @rp9-next @mihnita

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the version of icu used by the cldr-icu tooling. I do not think any change in 74.2 would affect the behavior of that tooling; and since the vision number had not been updated when I did the integration (so there was no icu4j artifact for 74.2), I could not use 74.2 anyway. No need for #2728 to touch this because we will not be doing another cldr-icu integration for 74.2.

<!-- Note: see https://github.com/unicode-org/icu/packages/1954682/versions
for the icu4j.version tag to use. In general we should just use the latest
SNAPSHOT for the ICU version that we want, so this should only need updating
Expand Down
Loading