Skip to content

ICU-23364 Add support of the new dayOfMonths CLDR resources (and the "ddd" pattern symbol) to ICU #4010

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

Open
richgillam wants to merge 15 commits into
base: main
Choose a base branch
from
Open

ICU-23364 Add support of the new dayOfMonths CLDR resources (and the "ddd" pattern symbol) to ICU #4010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
eedc8a1
ICU-23364 Step 1: Update CLDR-to-ICU tool to handle day names and upd…
richgillam May 19, 2026
a84b84f
ICU-23364 Step 2: Added new API to DateFormatSymbols to allow for get…
richgillam May 19, 2026
09bee3f
ICU-23364 Step 3: Added C wrapper for new DateFormatSymbols API and a…
richgillam May 19, 2026
c933b4b
ICU-23364 Step 4: Sync in more "ddd"-related changes from CLDR.
richgillam May 19, 2026
39c2db1
ICU-23364 Step 5: Updated DateTimePatternGenerator to handle "ddd" an…
richgillam May 19, 2026
499e04d
ICU-23364 Step 6: Update SimpleDateFormat to handle "ddd" properly, a…
richgillam May 19, 2026
a0f904a
ICU-23364 Step 7: Add parsing support and an appropriate unit test.
richgillam May 19, 2026
c2ebc71
ICU-23364 Step 8: Various cleanliness and efficiency changes suggeste…
richgillam May 20, 2026
54b90d7
ICU-23364 Step 9: Regenerate the ICU data on the Java side with the t…
richgillam May 28, 2026
35f7675
ICU-23364 Step 10: Fixed @draft tags in C++ code.
richgillam May 28, 2026
ada9ce0
ICU-23364 Step 11: Ported the day-name implementation and correspondi…
richgillam May 28, 2026
3fdaa2c
ICU-23364 Repair the damage to the Java locale data from an earlier c…
richgillam Jun 4, 2026
45e1b26
ICU-23364 Ran "mvn spotless" over all of the Java code.
richgillam Jun 4, 2026
5cd2e40
ICU-23364 Removed the new methods on DateFormatSymbols from the publi…
richgillam Jun 4, 2026
ddd0b5c
ICU-23364 More "mvn spotless" fixes.
richgillam Jun 5, 2026
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
  •  
  •  
  •  
26 changes: 25 additions & 1 deletion icu4c/source/data/dtd/cldr/common/dtd/ldml.dtd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<!--@METADATA-->
<!--@DEPRECATED-->

<!ELEMENT calendar ( alias | ( months?, monthNames?, monthAbbr?, monthPatterns?, days?, dayNames?, dayAbbr?, quarters?, week?, am*, pm*, dayPeriods?, eras?, cyclicNameSets?, dateFormats?, timeFormats?, dateTimeFormats?, fields*, special* ) ) >
<!ELEMENT calendar ( alias | ( months?, monthNames?, monthAbbr?, monthPatterns?, dayOfMonths?, days?, dayNames?, dayAbbr?, quarters?, week?, am*, pm*, dayPeriods?, eras?, cyclicNameSets?, dateFormats?, timeFormats?, dateTimeFormats?, fields*, special* ) ) >
<!-- use of fields is deprecated here -->
<!ATTLIST calendar type NMTOKEN #REQUIRED >
<!--@MATCH:bcp47/ca-->
Expand Down Expand Up @@ -1001,6 +1001,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<!ATTLIST monthPattern references CDATA #IMPLIED >
<!--@METADATA-->

<!ELEMENT dayOfMonths ( alias | ( default*, dayOfMonthContext*, special* ) ) >
<!ATTLIST dayOfMonths alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->

<!ELEMENT dayOfMonthContext ( alias | ( default*, dayOfMonthWidth*, special* ) ) >
<!ATTLIST dayOfMonthContext type (format) #REQUIRED >
<!ATTLIST dayOfMonthContext alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->

<!ELEMENT dayOfMonthWidth ( alias | ( dayOfMonth*, special* ) ) >
<!ATTLIST dayOfMonthWidth type (abbreviated | wide) #REQUIRED >
<!ATTLIST dayOfMonthWidth alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->

<!ELEMENT dayOfMonth ( #PCDATA ) >
<!-- There must be at least one of type or ordinal, but that constraint can't be expressed in the DTD -->
<!ATTLIST dayOfMonth type NMTOKEN #IMPLIED >
<!--@MATCH:literal/1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32-->
<!ATTLIST dayOfMonth ordinal (zero | one | two | few | many | other) #IMPLIED>
<!ATTLIST dayOfMonth alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
<!ATTLIST dayOfMonth draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->

<!ELEMENT days ( alias | ( default*, dayContext*, special* ) ) >
<!ATTLIST days alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
Expand Down
43 changes: 41 additions & 2 deletions icu4c/source/data/locales/en.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ en{
}
appendItems{
Day{"{0} ({2}: {1})"}
Day-Of-Week{"{0} {1}"}
Day-Of-Week{"{0}, {1}"}
Era{"{0} {1}"}
Hour{"{0} ({2}: {1})"}
Minute{"{0} ({2}: {1})"}
Expand Down Expand Up @@ -642,7 +642,9 @@ en{
GyMEd{"E, M/d/y G"}
GyMMM{"MMM y G"}
GyMMMEd{"E, MMM d, y G"}
GyMMMEddd{"E, MMM ddd, y G"}
GyMMMd{"MMM d, y G"}
GyMMMddd{"MMM ddd, y G"}
GyMd{"M/d/y G"}
H{"HH"}
Hm{"HH:mm"}
Expand All @@ -654,6 +656,7 @@ en{
MMMEd{"E, MMM d"}
MMMMd{"MMMM d"}
MMMd{"MMM d"}
MMMddd{"MMM ddd"}
Md{"M/d"}
d{"d"}
h{"h a"}
Expand All @@ -669,10 +672,21 @@ en{
yyyyMMMEd{"E, MMM d, y G"}
yyyyMMMM{"MMMM y G"}
yyyyMMMd{"MMM d, y G"}
yyyyMMMddd{"MMM ddd, y G"}
yyyyMd{"M/d/y G"}
yyyyQQQ{"QQQ y G"}
yyyyQQQQ{"QQQQ y G"}
}
dayOfMonthNames{
format{
abbreviated{
few{"{0}rd"}
one{"{0}st"}
other{"{0}th"}
two{"{0}nd"}
}
}
}
intervalFormats{
Bh{
B{"h B – h B"}
Expand Down Expand Up @@ -876,7 +890,7 @@ en{
}
appendItems{
Day{"{0} ({2}: {1})"}
Day-Of-Week{"{0} {1}"}
Day-Of-Week{"{0}, {1}"}
Era{"{0} {1}"}
Hour{"{0} ({2}: {1})"}
Minute{"{0} ({2}: {1})"}
Expand Down Expand Up @@ -918,12 +932,16 @@ en{
MEd{"E, M/d"}
MMM{"LLL"}
MMMEd{"E, MMM d"}
MMMEddd{"E, MMM ddd"}
MMMMEddd{"E, MMMM ddd"}
MMMMW{
one{"'week' W 'of' MMMM"}
other{"'week' W 'of' MMMM"}
}
MMMMd{"MMMM d"}
MMMMddd{"MMMM ddd"}
MMMd{"MMM d"}
MMMddd{"MMM ddd"}
Md{"M/d"}
d{"d"}
h{"h a"}
Expand All @@ -938,8 +956,10 @@ en{
yMEd{"E, M/d/y"}
yMMM{"MMM y"}
yMMMEd{"E, MMM d, y"}
yMMMEddd{"E, MMM ddd, y"}
yMMMM{"MMMM y"}
yMMMd{"MMM d, y"}
yMMMddd{"MMM ddd, y"}
yMd{"M/d/y"}
yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"}
Expand Down Expand Up @@ -1026,6 +1046,16 @@ en{
}
}
}
dayOfMonthNames{
format{
abbreviated{
few{"{0}rd"}
one{"{0}st"}
other{"{0}th"}
two{"{0}nd"}
}
}
}
dayPeriod{
format{
abbreviated{
Expand Down Expand Up @@ -1769,16 +1799,23 @@ en{
GyMMM{"MMM y G"}
GyMMMEEEEd{"EEEE, MMM d, y G"}
GyMMMEd{"E, MMM d, y G"}
GyMMMEddd{"E, MMM ddd, y G"}
GyMMMMEddd{"E, MMMM ddd, y G"}
GyMMMMddd{"MMMM ddd, y G"}
GyMMMd{"MMM d, y G"}
GyMMMddd{"MMM ddd, y G"}
GyMd{"M/d/y GGGGG"}
M{"L"}
MEEEEd{"EEEE, M/d"}
MEd{"E, M/d"}
MMM{"LLL"}
MMMEEEEd{"EEEE, MMM d"}
MMMEd{"E, MMM d"}
MMMEddd{"MMM ddd, E"}
MMMMd{"MMMM d"}
MMMMddd{"MMMM ddd"}
MMMd{"MMM d"}
MMMddd{"MMM ddd"}
Md{"M/d"}
d{"d"}
y{"y G"}
Expand All @@ -1790,8 +1827,10 @@ en{
yyyyMMM{"MMM y G"}
yyyyMMMEEEEd{"EEEE, MMMM d, y G"}
yyyyMMMEd{"E, MMM d, y G"}
yyyyMMMEddd{"G y MMM ddd, E"}
yyyyMMMM{"MMMM y G"}
yyyyMMMd{"MMM d, y G"}
yyyyMMMddd{"MMM ddd, y G"}
yyyyMd{"M/d/y GGGGG"}
yyyyQQQ{"QQQ y G"}
yyyyQQQQ{"QQQQ y G"}
Expand Down
37 changes: 37 additions & 0 deletions icu4c/source/data/locales/root.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,6 +1262,7 @@ root{
appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras{
abbreviated{
0{"BE"}
Expand Down Expand Up @@ -1505,6 +1506,7 @@ root{
}
}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
intervalFormats{
Bh{
B{"h B – h B"}
Expand Down Expand Up @@ -1679,6 +1681,7 @@ root{
appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras{
abbreviated{
1{"AM"}
Expand Down Expand Up @@ -1739,6 +1742,7 @@ root{
availableFormats:alias{"/LOCALE/calendar/chinese/availableFormats"}
cyclicNameSets:alias{"/LOCALE/calendar/chinese/cyclicNameSets"}
dayNames:alias{"/LOCALE/calendar/chinese/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
intervalFormats:alias{"/LOCALE/calendar/chinese/intervalFormats"}
monthNames:alias{"/LOCALE/calendar/chinese/monthNames"}
monthPatterns:alias{"/LOCALE/calendar/chinese/monthPatterns"}
Expand All @@ -1754,6 +1758,7 @@ root{
appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras{
abbreviated{
0{"AA"}
Expand Down Expand Up @@ -1814,6 +1819,7 @@ root{
appendItems:alias{"/LOCALE/calendar/ethiopic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/ethiopic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/ethiopic/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/ethiopic/dayOfMonthNames"}
eras{
abbreviated{
0{"AA"}
Expand Down Expand Up @@ -1887,7 +1893,11 @@ root{
GyMEd{"G y-MM-dd, E"}
GyMMM{"G y MMM"}
GyMMMEd{"G y MMM d, E"}
GyMMMEddd{"G y MMM ddd, E"}
GyMMMMEddd{"G y MMMM ddd, E"}
GyMMMMddd{"G y MMMM ddd"}
GyMMMd{"G y MMM d"}
GyMMMddd{"G y MMM ddd"}
GyMd{"G y-MM-dd"}
H{"HH"}
Hm{"HH:mm"}
Expand All @@ -1897,8 +1907,11 @@ root{
MEd{"MM-dd, E"}
MMM{"LLL"}
MMMEd{"MMM d, E"}
MMMEddd{"MMM ddd, E"}
MMMMd{"MMMM d"}
MMMMddd{"MMMM ddd"}
MMMd{"MMM d"}
MMMddd{"MMM ddd"}
Md{"MM-dd"}
d{"d"}
h{"h a"}
Expand All @@ -1912,13 +1925,16 @@ root{
yyyyMEd{"G y-MM-dd, E"}
yyyyMMM{"G y MMM"}
yyyyMMMEd{"G y MMM d, E"}
yyyyMMMEddd{"G y MMM ddd, E"}
yyyyMMMM{"G y MMMM"}
yyyyMMMd{"G y MMM d"}
yyyyMMMddd{"G y MMM ddd"}
yyyyMd{"G y-MM-dd"}
yyyyQQQ{"G y QQQ"}
yyyyQQQQ{"G y QQQQ"}
}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras{
abbreviated{
0{"ERA0"}
Expand Down Expand Up @@ -2173,7 +2189,9 @@ root{
GyMEd{"G y-MM-dd, E"}
GyMMM{"G y MMM"}
GyMMMEd{"G y MMM d, E"}
GyMMMEddd{"G y MMM ddd, E"}
GyMMMd{"G y MMM d"}
GyMMMddd{"G y MMM ddd"}
GyMd{"G y-MM-dd"}
H{"HH"}
Hm{"HH:mm"}
Expand All @@ -2185,11 +2203,15 @@ root{
MEd{"MM-dd, E"}
MMM{"LLL"}
MMMEd{"MMM d, E"}
MMMEddd{"MMM ddd, E"}
MMMMEddd{"MMMM ddd, E"}
MMMMW{
other{"'week' W 'of' MMMM"}
}
MMMMd{"MMMM d"}
MMMMddd{"MMMM ddd"}
MMMd{"MMM d"}
MMMddd{"MMM ddd"}
Md{"MM-dd"}
d{"d"}
h{"h a"}
Expand All @@ -2204,8 +2226,12 @@ root{
yMEd{"y-MM-dd, E"}
yMMM{"y MMM"}
yMMMEd{"y MMM d, E"}
yMMMEddd{"y MMM ddd, E"}
yMMMM{"y MMMM"}
yMMMMEddd{"y MMMM ddd, E"}
yMMMMddd{"y MMMM ddd"}
yMMMd{"y MMM d"}
yMMMddd{"y MMM ddd"}
yMd{"y-MM-dd"}
yQQQ{"y QQQ"}
yQQQQ{"y QQQQ"}
Expand Down Expand Up @@ -2463,6 +2489,7 @@ root{
appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras{
abbreviated{
0{"AM"}
Expand Down Expand Up @@ -2524,6 +2551,7 @@ root{
appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras{
abbreviated{
0{"Śaka"}
Expand Down Expand Up @@ -2581,6 +2609,7 @@ root{
appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras{
abbreviated{
0{"AH"}
Expand Down Expand Up @@ -2652,6 +2681,7 @@ root{
appendItems:alias{"/LOCALE/calendar/islamic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/islamic/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/islamic/dayOfMonthNames"}
eras:alias{"/LOCALE/calendar/islamic/eras"}
intervalFormats:alias{"/LOCALE/calendar/islamic/intervalFormats"}
monthNames:alias{"/LOCALE/calendar/islamic/monthNames"}
Expand All @@ -2666,6 +2696,7 @@ root{
appendItems:alias{"/LOCALE/calendar/islamic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/islamic/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/islamic/dayOfMonthNames"}
eras:alias{"/LOCALE/calendar/islamic/eras"}
intervalFormats:alias{"/LOCALE/calendar/islamic/intervalFormats"}
monthNames:alias{"/LOCALE/calendar/islamic/monthNames"}
Expand All @@ -2680,6 +2711,7 @@ root{
appendItems:alias{"/LOCALE/calendar/islamic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/islamic/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/islamic/dayOfMonthNames"}
eras:alias{"/LOCALE/calendar/islamic/eras"}
intervalFormats:alias{"/LOCALE/calendar/islamic/intervalFormats"}
monthNames:alias{"/LOCALE/calendar/islamic/monthNames"}
Expand All @@ -2694,6 +2726,7 @@ root{
appendItems:alias{"/LOCALE/calendar/islamic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/islamic/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras:alias{"/LOCALE/calendar/islamic/eras"}
intervalFormats:alias{"/LOCALE/calendar/islamic/intervalFormats"}
monthNames:alias{"/LOCALE/calendar/islamic/monthNames"}
Expand Down Expand Up @@ -2796,6 +2829,7 @@ root{
}
}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras:alias{"/LOCALE/calendar/gregorian/eras"}
intervalFormats{
Bh{
Expand Down Expand Up @@ -2951,6 +2985,7 @@ root{
appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras{
abbreviated{
232{"Meiji"}
Expand Down Expand Up @@ -2981,6 +3016,7 @@ root{
appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras{
abbreviated{
0{"AP"}
Expand Down Expand Up @@ -3038,6 +3074,7 @@ root{
appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
dayOfMonthNames:alias{"/LOCALE/calendar/gregorian/dayOfMonthNames"}
eras{
abbreviated{
0{"BROC"}
Expand Down
Loading
Loading