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

CLDR-17892 ISO 8601 calendar #4037

Merged
merged 8 commits into from
Sep 12, 2024
Merged

CLDR-17892 ISO 8601 calendar #4037

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
928ed1a
CLDR-17892 ISO 8601 calendar
macchiati Sep 10, 2024
ed6eac7
CLDR-17892 Updates to fix items noted by Peter, plus fixes in tests.
macchiati Sep 11, 2024
6781023
CLDR-17892 Fix path headers for new calendar
macchiati Sep 11, 2024
f1852b6
CLDR-17892 Fix placeholder failure
macchiati Sep 12, 2024
4d6ee93
CLDR-17892 Fixes for items Annemarie found
macchiati Sep 12, 2024
620d0fd
CLDR-17892 Updated release page
macchiati Sep 12, 2024
797a9f0
CLDR-17892 Minor fix to release page.
macchiati Sep 12, 2024
d954cf9
CLDR-17892 Fix stock formats to have HH
macchiati Sep 12, 2024
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
307 changes: 307 additions & 0 deletions common/main/root.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,6 +1936,313 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<alias source="locale" path="../../calendar[@type='islamic']/dateTimeFormats"/>
</dateTimeFormats>
</calendar>
<calendar type="iso8601">
<months>
<alias source="locale" path="../../calendar[@type='gregorian']/months"/>
</months>
<days>
<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
</days>
<quarters>
<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
</quarters>
<dayPeriods>
<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
</dayPeriods>
<eras>
<alias source="locale" path="../../calendar[@type='gregorian']/eras"/>
</eras>
<dateFormats>
<dateFormatLength type="full">
<dateFormat>
<pattern>y MMMM d</pattern>
<datetimeSkeleton>yMMMMd, EEEE</datetimeSkeleton>
</dateFormat>
</dateFormatLength>
<dateFormatLength type="long">
<dateFormat>
<pattern>y MMMM d</pattern>
<datetimeSkeleton>yMMMMd</datetimeSkeleton>
</dateFormat>
</dateFormatLength>
<dateFormatLength type="medium">
<dateFormat>
<pattern>y MMM d</pattern>
<datetimeSkeleton>yMMMd</datetimeSkeleton>
</dateFormat>
</dateFormatLength>
<dateFormatLength type="short">
<dateFormat>
<pattern>y-MM-dd</pattern>
<datetimeSkeleton>yMMdd</datetimeSkeleton>
</dateFormat>
</dateFormatLength>
</dateFormats>
<timeFormats>
<timeFormatLength type="full">
<timeFormat>
<pattern>HH:mm:ss zzzz</pattern>
<datetimeSkeleton>HHmmsszzzz</datetimeSkeleton>
</timeFormat>
</timeFormatLength>
<timeFormatLength type="long">
<timeFormat>
<pattern>HH:mm:ss z</pattern>
<datetimeSkeleton>HHmmssz</datetimeSkeleton>
</timeFormat>
</timeFormatLength>
<timeFormatLength type="medium">
<timeFormat>
<pattern>HH:mm:ss</pattern>
<datetimeSkeleton>HHmmss</datetimeSkeleton>
</timeFormat>
</timeFormatLength>
<timeFormatLength type="short">
<timeFormat>
<pattern>HH:mm</pattern>
<datetimeSkeleton>HHmm</datetimeSkeleton>
</timeFormat>
</timeFormatLength>
</timeFormats>
<dateTimeFormats>
<dateTimeFormatLength type="full">
<dateTimeFormat>
<pattern>{1} {0}</pattern>
</dateTimeFormat>
<dateTimeFormat type="atTime">
<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
</dateTimeFormat>
</dateTimeFormatLength>
<dateTimeFormatLength type="long">
<dateTimeFormat>
<pattern>{1} {0}</pattern>
</dateTimeFormat>
<dateTimeFormat type="atTime">
<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
</dateTimeFormat>
</dateTimeFormatLength>
<dateTimeFormatLength type="medium">
<dateTimeFormat>
<pattern>{1} {0}</pattern>
</dateTimeFormat>
<dateTimeFormat type="atTime">
<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
</dateTimeFormat>
</dateTimeFormatLength>
<dateTimeFormatLength type="short">
<dateTimeFormat>
<pattern>{1} {0}</pattern>
</dateTimeFormat>
<dateTimeFormat type="atTime">
<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
</dateTimeFormat>
</dateTimeFormatLength>
<availableFormats>
<dateFormatItem id="Bh">h B</dateFormatItem>
<dateFormatItem id="Bhm">h:mm B</dateFormatItem>
<dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
<dateFormatItem id="d">d</dateFormatItem>
<dateFormatItem id="E">ccc</dateFormatItem>
<dateFormatItem id="EBhm">E h:mm B</dateFormatItem>
<dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem>
<dateFormatItem id="Ed">d, E</dateFormatItem>
<dateFormatItem id="Ehm">E HH:mm</dateFormatItem>
<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
<dateFormatItem id="Ehms">E HH:mm:ss</dateFormatItem>
<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
<dateFormatItem id="Gy">y</dateFormatItem>
<dateFormatItem id="GyMd">y-MM-dd</dateFormatItem>
<dateFormatItem id="GyMMM">y MMM</dateFormatItem>
<dateFormatItem id="GyMMMd">y MMM d</dateFormatItem>
<dateFormatItem id="GyMMMEd">y MMM d, E</dateFormatItem>
<dateFormatItem id="h">HH</dateFormatItem>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<dateFormatItem id="H">HH</dateFormatItem>
<dateFormatItem id="hm">HH:mm</dateFormatItem>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<dateFormatItem id="Hm">HH:mm</dateFormatItem>
<dateFormatItem id="hms">HH:mm:ss</dateFormatItem>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
<dateFormatItem id="hmsv">HH:mm:ss v</dateFormatItem>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
<dateFormatItem id="hmv">HH:mm v</dateFormatItem>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
<dateFormatItem id="M">L</dateFormatItem>
<dateFormatItem id="Md">MM-dd</dateFormatItem>
<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
<dateFormatItem id="MMM">LLL</dateFormatItem>
<dateFormatItem id="MMMd">MMM d</dateFormatItem>
<dateFormatItem id="MMMEd">MMM d</dateFormatItem>
<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
<dateFormatItem id="MMMMW" count="other">MMMM 'week' W</dateFormatItem>
<dateFormatItem id="ms">mm:ss</dateFormatItem>
<dateFormatItem id="y">y</dateFormatItem>
<dateFormatItem id="yM">y-MM</dateFormatItem>
<dateFormatItem id="yMd">y-MM-dd</dateFormatItem>
<dateFormatItem id="yMEd">y-MM-dd, E</dateFormatItem>
<dateFormatItem id="yMMM">y MMM</dateFormatItem>
<dateFormatItem id="yMMMd">y MMM d</dateFormatItem>
<dateFormatItem id="yMMMEd">y MMM d</dateFormatItem>
<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
<dateFormatItem id="yw" count="other">Y 'week' w</dateFormatItem>
</availableFormats>
<appendItems>
<appendItem request="Day">{0} ({2}: {1})</appendItem>
<appendItem request="Day-Of-Week">{0} {1}</appendItem>
<appendItem request="Era">{1} {0}</appendItem>
<appendItem request="Hour">{0} ({2}: {1})</appendItem>
<appendItem request="Minute">{0} ({2}: {1})</appendItem>
<appendItem request="Month">{0} ({2}: {1})</appendItem>
<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
<appendItem request="Second">{0} ({2}: {1})</appendItem>
<appendItem request="Timezone">{0} {1}</appendItem>
<appendItem request="Week">{0} ({2}: {1})</appendItem>
<appendItem request="Year">{1} {0}</appendItem>
</appendItems>
<intervalFormats>
<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
<intervalFormatItem id="Bh">
<greatestDifference id="B">h B – h B</greatestDifference>
<greatestDifference id="h">h–h B</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="Bhm">
<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
<greatestDifference id="h">h:mm–h:mm B</greatestDifference>
<greatestDifference id="m">h:mm–h:mm B</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="d">
<greatestDifference id="d">d–d</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="Gy">
<greatestDifference id="G">y – y</greatestDifference>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<greatestDifference id="y">y–y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyM">
<greatestDifference id="G">y-MM – y-MM</greatestDifference>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<greatestDifference id="M">y-MM – y-MM</greatestDifference>
<greatestDifference id="y">y-MM – y-MM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMd">
<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<greatestDifference id="G">y-MM-dd – y-MM-dd</greatestDifference>
<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMEd">
<greatestDifference id="d">y-MM-dd, E – y-MM-dd, E</greatestDifference>
<greatestDifference id="G">y-MM-dd, E – GGGGG y-MM-dd, E</greatestDifference>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMM">
<greatestDifference id="G">y MMM – G y MMM</greatestDifference>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<greatestDifference id="M">y MMM–MMM</greatestDifference>
<greatestDifference id="y">y MMM – y MMM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMMd">
<greatestDifference id="d">y MMM d–d</greatestDifference>
<greatestDifference id="G">y MMM d – y MMM d</greatestDifference>
<greatestDifference id="M">y MMM d – MMM d</greatestDifference>
<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMMEd">
<greatestDifference id="d">y MMM d, E – MMM d, E</greatestDifference>
<greatestDifference id="G">y MMM d, E – y MMM d, E</greatestDifference>
<greatestDifference id="M">y MMM d, E – MMM d, E</greatestDifference>
<greatestDifference id="y">y MMM d, E – y MMM d, E</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="h">
<greatestDifference id="a">HH–HH</greatestDifference>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<greatestDifference id="h">HH–HH</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="H">
<greatestDifference id="H">HH–HH</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="hm">
<greatestDifference id="a">HH:mm–HH:mm</greatestDifference>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<greatestDifference id="h">HH:mm–HH:mm</greatestDifference>
<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="Hm">
<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="hmv">
<greatestDifference id="a">HH:mm–HH:mm v</greatestDifference>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<greatestDifference id="h">HH:mm–HH:mm v</greatestDifference>
<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="Hmv">
<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="hv">
<greatestDifference id="a">HH–HH v</greatestDifference>
macchiati marked this conversation as resolved.
Show resolved Hide resolved
<greatestDifference id="h">HH–HH v</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="Hv">
<greatestDifference id="H">HH–HH v</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="M">
<greatestDifference id="M">MM–MM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="Md">
<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MEd">
<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMM">
<greatestDifference id="M">LLL–LLL</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMMd">
<greatestDifference id="d">MMM d–d</greatestDifference>
<greatestDifference id="M">MMM d – MMM d</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMMEd">
<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="y">
<greatestDifference id="y">y–y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yM">
<greatestDifference id="M">y-MM – y-MM</greatestDifference>
<greatestDifference id="y">y-MM – y-MM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMd">
<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMEd">
<greatestDifference id="d">y-MM-dd, E – y-MM-dd, E</greatestDifference>
<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMM">
<greatestDifference id="M">y MMM–MMM</greatestDifference>
<greatestDifference id="y">y MMM – y MMM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMd">
<greatestDifference id="d">y MMM d–d</greatestDifference>
<greatestDifference id="M">y MMM d – MMM d</greatestDifference>
<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMEd">
<greatestDifference id="d">y MMM d, E – MMM d, E</greatestDifference>
<greatestDifference id="M">y MMM d, E – MMM d, E</greatestDifference>
<greatestDifference id="y">y MMM d, E – y MMM d, E</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMM">
<greatestDifference id="M">y MMMM–MMMM</greatestDifference>
<greatestDifference id="y">y MMMM – y MMMM</greatestDifference>
</intervalFormatItem>
</intervalFormats>
</dateTimeFormats>
</calendar>
<calendar type="japanese">
<months>
<alias source="locale" path="../../calendar[@type='gregorian']/months"/>
Expand Down
Loading
Loading