Skip to content

Commit

Permalink
Merge branch 'maint/maint-75' into memory-error-handling
Browse files Browse the repository at this point in the history
  • Loading branch information
@echeran
echeran committed Apr 11, 2024
2 parents 51f7e54 + 6d4cea5 commit 30e1c4f
Show file tree
Hide file tree
Showing 1,196 changed files with 3,854 additions and 3,702 deletions.
2,032 changes: 1,013 additions & 1,019 deletions icu4c/source/common/localefallback_data.h
View file

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions icu4c/source/common/loclikely.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,17 @@ _uloc_addLikelySubtags(const char* localeID,
return;
}

if (lang.length() > 3) {
if (lang.length() == 4 && script.isEmpty()) {
if (lang.length() == 4) {
if (script.isEmpty()) {
script = std::move(lang);
lang.clear();
} else {
err = U_ILLEGAL_ARGUMENT_ERROR;
return;
}
} else if (lang.length() > 8) {
err = U_ILLEGAL_ARGUMENT_ERROR;
return;
}

int32_t trailingLength = (int32_t)uprv_strlen(trailing);
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/common/uloc_tag.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2406,7 +2406,7 @@ ultag_close(ULanguageTag* langtag) {
ExtensionListEntry *curExt = langtag->extensions;
while (curExt) {
ExtensionListEntry *nextExt = curExt->next;
uprv_free(curExt);
delete curExt;
curExt = nextExt;
}
}
Expand Down
16 changes: 8 additions & 8 deletions icu4c/source/data/curr/supplementalData.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1199,8 +1199,8 @@ supplementalData:table(nofallback){
CW{
{
from:intvector{
398,
-1834351104,
405,
-363122176,
}
id{"XCG"}
}
Expand All @@ -1211,8 +1211,8 @@ supplementalData:table(nofallback){
}
id{"ANG"}
to:intvector{
400,
1819481599,
407,
-1004256769,
}
}
}
Expand Down Expand Up @@ -3960,8 +3960,8 @@ supplementalData:table(nofallback){
SX{
{
from:intvector{
398,
-1834351104,
405,
-363122176,
}
id{"XCG"}
}
Expand All @@ -3972,8 +3972,8 @@ supplementalData:table(nofallback){
}
id{"ANG"}
to:intvector{
400,
1819481599,
407,
-1004256769,
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/dtd/cldr/common/dtd/ldml.dtd
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
Copyright © 1991-2024 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
SPDX-License-Identifier: Unicode-3.0
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-->

Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/dtd/cldr/common/dtd/ldmlICU.dtd
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
Copyright © 1991-2021 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
SPDX-License-Identifier: Unicode-3.0
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-->

Expand Down
106 changes: 44 additions & 62 deletions icu4c/source/data/locales/ta.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,10 @@ ta{
calendar{
chinese{
DateTimePatterns{
"a h:mm:ss zzzz",
"a h:mm:ss z",
"a h:mm:ss",
"a h:mm",
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
"U MMMM d, EEEE",
"U, d MMMM",
"U, d MMM",
Expand Down Expand Up @@ -363,10 +363,10 @@ ta{
}
generic{
DateTimePatterns{
"a h:mm:ss zzzz",
"a h:mm:ss z",
"a h:mm:ss",
"a h:mm",
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
"EEEE, d MMMM, y G",
"d MMMM, y G",
"d MMM, y G",
Expand Down Expand Up @@ -400,8 +400,8 @@ ta{
EBhm{"E B h:mm"}
EBhms{"E B h:mm:ss"}
Ed{"d E"}
Ehm{"E a h:mm"}
Ehms{"E a h:mm:ss"}
Ehm{"E h:mm a"}
Ehms{"E h:mm:ss a"}
Gy{"y G"}
GyMMM{"MMM y G"}
GyMMMEd{"E, d MMM, y G"}
Expand All @@ -413,9 +413,9 @@ ta{
MMMd{"d MMM"}
MMdd{"dd-MM"}
Md{"d/M"}
h{"a h"}
hm{"a h:mm"}
hms{"a h:mm:ss"}
h{"h a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
y{"y G"}
yyyy{"y G"}
yyyyM{"M/y G"}
Expand Down Expand Up @@ -457,22 +457,22 @@ ta{
}
fallback{"{0} – {1}"}
h{
a{"a h – a h"}
h{"a h–h"}
a{"h a – h a"}
h{"h–h a"}
}
hm{
a{"a h:mm – a h:mm"}
h{"a h:mm–h:mm"}
m{"a h:mm–h:mm"}
a{"h:mm a – h:mm a"}
h{"h:mm–h:mm a"}
m{"h:mm–h:mm a"}
}
hmv{
a{"a h:mm – a h:mm v"}
h{"a h:mm–h:mm v"}
m{"a h:mm–h:mm v"}
a{"h:mm – h:mm a v"}
h{"h:mm–h:mm a v"}
m{"h:mm–h:mm a v"}
}
hv{
a{"a h – a h v"}
h{"a h–h v"}
a{"h a – h a v"}
h{"h–h a v"}
}
y{
y{"y – y G"}
Expand Down Expand Up @@ -512,19 +512,11 @@ ta{
}
}
gregorian{
AmPmMarkersAbbr{
"AM",
"பிற்பகல்",
}
AmPmMarkersNarrow{
"மு.ப",
"பி.ப",
}
DateTimePatterns{
"a h:mm:ss zzzz",
"a h:mm:ss z",
"a h:mm:ss",
"a h:mm",
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
"EEEE, d MMMM, y",
"d MMMM, y",
"d MMM, y",
Expand Down Expand Up @@ -558,8 +550,8 @@ ta{
EBhm{"E B h:mm"}
EBhms{"E B h:mm:ss"}
Ed{"d E"}
Ehm{"E a h:mm"}
Ehms{"E a h:mm:ss"}
Ehm{"E h:mm a"}
Ehms{"E h:mm:ss a"}
GyMd{"d/M/y G"}
MEd{"dd-MM, E"}
MMMMW{
Expand All @@ -569,11 +561,11 @@ ta{
MMMMd{"d MMMM"}
MMdd{"dd-MM"}
Md{"d/M"}
h{"a h"}
hm{"a h:mm"}
hms{"a h:mm:ss"}
hmsv{"a h:mm:ss v"}
hmv{"a h:mm v"}
h{"h a"}
hm{"h:mm a"}
hms{"h:mm:ss a"}
hmsv{"h:mm:ss a v"}
hmv{"h:mm a v"}
yM{"M/y"}
yMEd{"E, d/M/y"}
yMM{"MM-y"}
Expand Down Expand Up @@ -657,26 +649,16 @@ ta{
}
}
stand-alone{
abbreviated{
am{"முற்பகல்"}
pm{"பிற்பகல்"}
}
narrow{
afternoon1{"மதி."}
afternoon2{"பிற்."}
am{"மு.ப"}
evening1{"மா."}
evening2{"அந்தி மா."}
midnight{"நள்."}
morning1{"அதி."}
morning2{"கா."}
night1{"இ."}
noon{"நண்."}
pm{"பி.ப"}
}
wide{
am{"முற்பகல்"}
pm{"பிற்பகல்"}
}
}
}
Expand Down Expand Up @@ -733,22 +715,22 @@ ta{
}
fallback{"{0} – {1}"}
h{
a{"a h – a h"}
h{"a h–h"}
a{"h a – h a"}
h{"h–h a"}
}
hm{
a{"a h:mm – a h:mm"}
h{"a h:mm–h:mm"}
m{"a h:mm–h:mm"}
a{"h:mm a – h:mm a"}
h{"h:mm–h:mm a"}
m{"h:mm–h:mm a"}
}
hmv{
a{"a h:mm – a h:mm v"}
h{"a h:mm – h:mm v"}
m{"a h:mm – h:mm v"}
a{"h:mm a – h:mm a v"}
h{"h:mm – h:mm a v"}
m{"h:mm – h:mm a v"}
}
hv{
a{"a h – a h v"}
h{"a h – h v"}
a{"h a – h a v"}
h{"h – h a v"}
}
y{
y{"y – y"}
Expand Down
Loading

0 comments on commit 30e1c4f

Please sign in to comment.