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-22922 CLDR 47 alpha1 to main #3356

Merged
merged 5 commits into from
Jan 30, 2025
Merged

ICU-22922 CLDR 47 alpha1 to main #3356

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7caa1c7
ICU-22922 Integrate CLDR 47 release alpha1, part 1, binary files
DraganBesevic Jan 28, 2025
d732fe0
ICU-22922 Integrate CLDR 47 release alpha1, part 2, data files
DraganBesevic Jan 28, 2025
484fa7f
ICU-22922 Integrate CLDR 47 release alpha1, part 3, source files
DraganBesevic Jan 28, 2025
d560b58
ICU-22922 Integrate CLDR 47 release alpha1, part 4, updated unit test
DraganBesevic Jan 29, 2025
7c7a97d
ICU-22922 Integrate CLDR 47 release alpha1, part 5, updated unit test…
DraganBesevic Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
1,961 changes: 988 additions & 973 deletions icu4c/source/common/localefallback_data.h
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions icu4c/source/data/brkitr/LOCALE_DEPS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/

{
"cldrVersion": "46"
"cldrVersion": "47"
}
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/de.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
de{
exceptions{
SentenceBreak:array{
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/el.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
el{
boundaries{
sentence:process(dependency){"sent_el.brk"}
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/en.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
en{
exceptions{
SentenceBreak:array{
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/en_US.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
en_US{
}
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/en_US_POSIX.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
en_US_POSIX{
boundaries{
word:process(dependency){"word_POSIX.brk"}
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/es.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
es{
exceptions{
SentenceBreak:array{
Expand Down
5 changes: 5 additions & 0 deletions icu4c/source/data/brkitr/fi.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/
fi{
}
Comment on lines +4 to +5
Copy link
Member

Choose a reason for hiding this comment

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

Why are we getting an empty Finnish brkitr file? Is there a new empty Finnish CLDR file?

Same question for sv=Swedish.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm. We no longer have fi or sv entries in icu4c/source/data/xml/brkitr/*.xml which was my first guess at why these might be there.

Copy link
Member

Choose a reason for hiding this comment

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

Progress figuring this out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My best guess is that fi or sv entries in icu4c/source/data/xml/brkitr/*.xml got removed, but they are still somewhere in some list for building .txt files from that repo. I will look at it

Copy link
Contributor

@pedberg-icu pedberg-icu Jan 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

If I have a chance today I will also try do an integration to investigate this...

But I see that in CLDR, common/segmentation/ still has word break tailorings for fi and sv. Perhaps these need to be removed; even thought the contents of the tailorings are not converted for ICU, the presence of the files may affect ICU. This probably needs to be discussed with Mark.

Copy link
Contributor

Choose a reason for hiding this comment

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

The fi/sv wordbreak tailorings were removed in ICU in October 2024 per ICU-22941 for ICU 77, so this is the first integration of CLDR for ICU 77. Those word break tailorings were added in CLDR in Aug 2022 per CLDR-15910 for CLDR 42. Need to file a CLDR ticket to remove them.

Copy link
Contributor

Choose a reason for hiding this comment

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

Will ignore for this integration, address in CLDR for next integration

2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/fr.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
fr{
exceptions{
SentenceBreak:array{
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/it.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
it{
exceptions{
SentenceBreak:array{
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/ja.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
ja{
boundaries{
line:process(dependency){"line_normal.brk"}
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/ko.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
ko{
boundaries{
line:process(dependency){"line_normal.brk"}
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/pt.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
pt{
exceptions{
SentenceBreak:array{
Expand Down
4 changes: 2 additions & 2 deletions icu4c/source/data/brkitr/root.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
root{
Version{"46"}
Version{"47"}
boundaries{
grapheme:process(dependency){"char.brk"}
line:process(dependency){"line.brk"}
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/ru.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
ru{
exceptions{
SentenceBreak:array{
Expand Down
5 changes: 5 additions & 0 deletions icu4c/source/data/brkitr/sv.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/
sv{
}
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/zh.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
zh{
boundaries{
line:process(dependency){"line_cj.brk"}
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/zh_Hant.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
zh_Hant{
boundaries{
line:process(dependency){"line_cj.brk"}
Expand Down
4 changes: 2 additions & 2 deletions icu4c/source/data/coll/LOCALE_DEPS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/

{
"cldrVersion": "46",
"cldrVersion": "47",
"aliases": {
"ars": "ar_SA",
"in": "id",
Expand Down
4 changes: 2 additions & 2 deletions icu4c/source/data/coll/af.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
af{
collations{
standard{
Sequence{"&N<<<ʼn"}
Version{"46"}
Version{"47"}
}
}
}
4 changes: 2 additions & 2 deletions icu4c/source/data/coll/am.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
am{
collations{
standard{
Sequence{"[reorder Ethi]"}
Version{"46"}
Version{"47"}
}
}
}
6 changes: 3 additions & 3 deletions icu4c/source/data/coll/ar.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
ar{
collations{
compat{
Expand All @@ -9,7 +9,7 @@ ar{
"&ت<<ة<<<ﺔ<<<ﺓ"
"&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ"
}
Version{"46"}
Version{"47"}
}
standard{
Sequence{
Expand Down Expand Up @@ -397,7 +397,7 @@ ar{
"‎&ۓ‎=ﮰ‎=ﮱ"
"‎&ۀ‎=ﮤ‎=ﮥ"
}
Version{"46"}
Version{"47"}
}
}
}
2 changes: 1 addition & 1 deletion icu4c/source/data/coll/ar_SA.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
/**
* generated alias target
*/
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/coll/ars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
ars{
"%%ALIAS"{"ar_SA"}
}
4 changes: 2 additions & 2 deletions icu4c/source/data/coll/as.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
as{
collations{
standard{
Expand All @@ -11,7 +11,7 @@ as{
"&[before 1]ত<ৎ=ত্\u200D"
"&হ<ক্ষ"
}
Version{"46"}
Version{"47"}
}
}
}
6 changes: 3 additions & 3 deletions icu4c/source/data/coll/az.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
az{
collations{
search{
Expand All @@ -9,7 +9,7 @@ az{
"[import az-u-co-standard]"
"[reorder others]"
}
Version{"46"}
Version{"47"}
}
standard{
Sequence{
Expand All @@ -26,7 +26,7 @@ az{
"&H<x<<<X"
"&Z<w<<<W"
}
Version{"46"}
Version{"47"}
}
}
}
4 changes: 2 additions & 2 deletions icu4c/source/data/coll/be.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
be{
collations{
standard{
Expand All @@ -9,7 +9,7 @@ be{
"&Е<ё<<<Ё"
"&у<ў<<<Ў"
}
Version{"46"}
Version{"47"}
}
}
}
4 changes: 2 additions & 2 deletions icu4c/source/data/coll/bg.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
bg{
collations{
standard{
Sequence{"[reorder Cyrl]"}
Version{"46"}
Version{"47"}
}
}
}
6 changes: 3 additions & 3 deletions icu4c/source/data/coll/bn.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
bn{
collations{
standard{
Expand All @@ -9,7 +9,7 @@ bn{
"[reorder Beng Deva Guru Gujr Orya Taml Telu Knda Mlym Sinh]"
"&ঔ<ং<ঃ<ঁ"
}
Version{"46"}
Version{"47"}
}
traditional{
Sequence{
Expand Down Expand Up @@ -629,7 +629,7 @@ bn{
"&যৌ<<<য়ৌ"
"&য্<<<য়্"
}
Version{"46"}
Version{"47"}
}
}
}
4 changes: 2 additions & 2 deletions icu4c/source/data/coll/bo.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
bo{
collations{
standard{
Expand Down Expand Up @@ -65,7 +65,7 @@ bo{
"&ྲཱྀ=ཷ"
"&ླཱྀ=ཹ"
}
Version{"46"}
Version{"47"}
}
}
}
4 changes: 2 additions & 2 deletions icu4c/source/data/coll/br.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
br{
collations{
standard{
Sequence{
"&C<ch<<<Ch<<<CH<c''h=c\u02BCh=c\u2019h<<<C''h=C\u02BCh=C\u2019h<<<C'"
"'H=C\u02BCH=C\u2019H"
}
Version{"46"}
Version{"47"}
}
}
}
6 changes: 3 additions & 3 deletions icu4c/source/data/coll/bs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
bs{
collations{
search{
Sequence{"[import hr-u-co-search]"}
Version{"46"}
Version{"47"}
}
standard{
Sequence{"[import hr]"}
Version{"46"}
Version{"47"}
}
}
}
4 changes: 2 additions & 2 deletions icu4c/source/data/coll/bs_Cyrl.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
bs_Cyrl{
collations{
standard{
Sequence{"[import sr]"}
Version{"46"}
Version{"47"}
}
}
}
Loading
Loading