Skip to content

Commit 13518ee

Browse files
authored
CLDR-18447 Updated English names for iso8601 calendar, coverage, tests (#4575)
1 parent 44c96ed commit 13518ee

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

common/main/en.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1364,7 +1364,8 @@ annotations.
13641364
<type key="calendar" type="islamic-rgsa">Hijri Calendar (Saudi Arabia, sighting)</type>
13651365
<type key="calendar" type="islamic-tbla">Hijri Calendar (tabular, astronomical epoch)</type>
13661366
<type key="calendar" type="islamic-umalqura">Hijri Calendar (Umm al-Qura)</type>
1367-
<type key="calendar" type="iso8601">ISO-8601 Calendar</type>
1367+
<type key="calendar" type="iso8601">Gregorian Calendar (Year First)</type>
1368+
<type key="calendar" type="iso8601" alt="variant">ISO 8601 Order</type>
13681369
<type key="calendar" type="japanese">Japanese Calendar</type>
13691370
<type key="calendar" type="persian">Persian Calendar</type>
13701371
<type key="calendar" type="roc">Minguo Calendar</type>

common/supplemental/coverageLevels.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,10 @@ For terms of use, see http://www.unicode.org/copyright.html
361361
<coverageLevel value="moderate" match="dates/calendars/calendar[@type='generic']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%atTimePattern"/>
362362
<coverageLevel value="moderate" match="dates/calendars/calendar[@type='generic']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%relativePattern"/>
363363

364-
<coverageLevel value="basic" match="dates/calendars/calendar[@type='(gregorian|iso8601)']/dateTimeFormats/intervalFormats/intervalFormatFallback"/>
365-
<coverageLevel value="moderate" match="dates/calendars/calendar[@type='generic']/dateTimeFormats/intervalFormats/intervalFormatFallback"/>
364+
<coverageLevel value="basic" match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/intervalFormats/intervalFormatFallback"/>
365+
<coverageLevel value="moderate" match="dates/calendars/calendar[@type='(generic|iso8601)']/dateTimeFormats/intervalFormats/intervalFormatFallback"/>
366366

367-
<coverageLevel value="basic" match="dates/calendars/calendar[@type='(gregorian|iso8601)']/dateTimeFormats/availableFormats/dateFormatItem[@id='%basicDateSkeletons']"/>
367+
<coverageLevel value="basic" match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/availableFormats/dateFormatItem[@id='%basicDateSkeletons']"/>
368368
<coverageLevel value="moderate" match="dates/calendars/calendar[@type='(gregorian|iso8601)']/dateTimeFormats/availableFormats/dateFormatItem[@id='%anyAttribute']"/>
369369

370370
<coverageLevel value="moderate" match="dates/calendars/calendar[@type='gregorian']/eras/eraAbbr/era[@type='(0|1)']"/>
@@ -681,6 +681,7 @@ For terms of use, see http://www.unicode.org/copyright.html
681681
<coverageLevel value="moderate" match="localeDisplayNames/territories/territory[@type='%territory60']"/>
682682
<coverageLevel inTerritory="EU" value="moderate" match="localeDisplayNames/territories/territory[@type='%territory60_EU']"/>
683683
<coverageLevel value="moderate" match="localeDisplayNames/types/type[@key='calendar'][@type='iso8601']"/>
684+
<coverageLevel value="moderate" match="localeDisplayNames/types/type[@key='calendar'][@type='iso8601'][@alt='variant']"/>
684685
<coverageLevel value="moderate" match="numbers/currencies/currency[@type='%currency60']/symbol"/>
685686
<coverageLevel value="moderate" match="numbers/currencies/currency[@type='%currency60']/symbol[@alt='(narrow|variant)']"/>
686687
<coverageLevel value="moderate" match="numbers/currencies/currency[@type='%currency60']/displayName"/>

common/testData/localeIdentifiers/localeDisplayName.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ en-u-ca-islamic-civil; English (Hijri Calendar [tabular, civil epoch])
5656
en-u-ca-islamic-rgsa; English (Hijri Calendar [Saudi Arabia, sighting])
5757
en-u-ca-islamic-tbla; English (Hijri Calendar [tabular, astronomical epoch])
5858
en-u-ca-islamic-umalqura; English (Hijri Calendar [Umm al-Qura])
59-
en-u-ca-iso8601; English (ISO-8601 Calendar)
59+
en-u-ca-iso8601; English (Gregorian Calendar [Year First])
6060
en-u-ca-japanese; English (Japanese Calendar)
6161
en-u-ca-persian; English (Persian Calendar)
6262
en-u-ca-roc; English (Minguo Calendar)

tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/PathDescriptions.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
^//ldml/localeDisplayNames/types/type\[@key="collation"]\[@type="([^"]*)"]; The name of “{1} collation” (sorting order). For more information, please see %KEY_NAMES.
6464
^//ldml/localeDisplayNames/types/type\[@key="numbers"]\[@type="([^"]*)"]; The name of “{1} number system”. For more information, please see %KEY_NAMES.
6565
^//ldml/localeDisplayNames/types/type\[@key="calendar"]\[@type="roc"]; The name of “roc calendar” (common names include “Minguo Calendar”, “Republic of China Calendar”, and “Republican Calendar”). For more information, please see %KEY_NAMES.
66+
^//ldml/localeDisplayNames/types/type\[@key="calendar"]\[@type="([^"]*)"]\[@alt="variant"]; The alternate name of “{1} calendar”. For more information, please see %KEY_NAMES.
6667
^//ldml/localeDisplayNames/types/type\[@key="calendar"]\[@type="([^"]*)"]; The name of “{1} calendar”. For more information, please see %KEY_NAMES.
6768
^//ldml/localeDisplayNames/types/type\[@key="em"]\[@type="([^"]*)"]; The name of “emoji presentation style {1}”. For more information, please see %KEY_NAMES.
6869
^//ldml/localeDisplayNames/types/type\[@key="fw"]\[@type="([^"]*)"]; The name of “first day of the week is {1}”. For more information, please see %KEY_NAMES.

tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2166,7 +2166,8 @@ public void testLightSpeed() {
21662166
"//ldml/localeDisplayNames/keys/key[@type=\"*\"]"
21672167
+ "//ldml/localeDisplayNames/measurementSystemNames/measurementSystemName[@type=\"*\"]"
21682168
+ "//ldml/localeDisplayNames/subdivisions/subdivision[@type=\"*\"]"
2169-
+ "//ldml/localeDisplayNames/types/type[@key=\"*\"][@type=\"*\"]",
2169+
+ "//ldml/localeDisplayNames/types/type[@key=\"*\"][@type=\"*\"]"
2170+
+ "//ldml/localeDisplayNames/types/type[@key=\"*\"][@type=\"*\"][@alt=\"*\"]",
21702171
"*"
21712172
},
21722173
{

0 commit comments

Comments
 (0)