Skip to content

Commit cce405f

Browse files
pedberg-icupedberg-icu
committed
CLDR-18350 Add dateTimeFormat type=relative, update spec, coverage, ExampleGenerator, tests
1 parent 081c282 commit cce405f

File tree

17 files changed

+263
-39
lines changed

17 files changed

+263
-39
lines changed

‎common/dtd/ldml.dtd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1528,7 +1528,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
15281528

15291529
<!ELEMENT dateTimeFormat ( alias | ( pattern*, displayName*, special* ) ) >
15301530
<!ATTLIST dateTimeFormat type NMTOKEN "standard" >
1531-
<!--@MATCH:literal/standard, atTime-->
1531+
<!--@MATCH:literal/standard, atTime, relative-->
15321532
<!ATTLIST dateTimeFormat alt NMTOKENS #IMPLIED >
15331533
<!--@MATCH:literal/variant-->
15341534
<!ATTLIST dateTimeFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >

‎common/main/en.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,6 +1827,9 @@ annotations.
18271827
<dateTimeFormat type="atTime">
18281828
<pattern>{1} 'at' {0}</pattern>
18291829
</dateTimeFormat>
1830+
<dateTimeFormat type="relative">
1831+
<pattern>{1} 'at' {0}</pattern>
1832+
</dateTimeFormat>
18301833
</dateTimeFormatLength>
18311834
<dateTimeFormatLength type="long">
18321835
<dateTimeFormat>
@@ -1835,6 +1838,9 @@ annotations.
18351838
<dateTimeFormat type="atTime">
18361839
<pattern>{1} 'at' {0}</pattern>
18371840
</dateTimeFormat>
1841+
<dateTimeFormat type="relative">
1842+
<pattern>{1} 'at' {0}</pattern>
1843+
</dateTimeFormat>
18381844
</dateTimeFormatLength>
18391845
<dateTimeFormatLength type="medium">
18401846
<dateTimeFormat>
@@ -2044,6 +2050,9 @@ annotations.
20442050
<dateTimeFormat type="atTime">
20452051
<pattern>{1} 'at' {0}</pattern>
20462052
</dateTimeFormat>
2053+
<dateTimeFormat type="relative">
2054+
<pattern>{1} 'at' {0}</pattern>
2055+
</dateTimeFormat>
20472056
</dateTimeFormatLength>
20482057
<dateTimeFormatLength type="long">
20492058
<dateTimeFormat>
@@ -2052,6 +2061,9 @@ annotations.
20522061
<dateTimeFormat type="atTime">
20532062
<pattern>{1} 'at' {0}</pattern>
20542063
</dateTimeFormat>
2064+
<dateTimeFormat type="relative">
2065+
<pattern>{1} 'at' {0}</pattern>
2066+
</dateTimeFormat>
20552067
</dateTimeFormatLength>
20562068
<dateTimeFormatLength type="medium">
20572069
<dateTimeFormat>
@@ -2060,6 +2072,9 @@ annotations.
20602072
<dateTimeFormat type="atTime">
20612073
<pattern>{1}, {0}</pattern>
20622074
</dateTimeFormat>
2075+
<dateTimeFormat type="relative">
2076+
<pattern>{1}, {0}</pattern>
2077+
</dateTimeFormat>
20632078
</dateTimeFormatLength>
20642079
<dateTimeFormatLength type="short">
20652080
<dateTimeFormat>
@@ -2068,6 +2083,9 @@ annotations.
20682083
<dateTimeFormat type="atTime">
20692084
<pattern>{1}, {0}</pattern>
20702085
</dateTimeFormat>
2086+
<dateTimeFormat type="relative">
2087+
<pattern>{1}, {0}</pattern>
2088+
</dateTimeFormat>
20712089
</dateTimeFormatLength>
20722090
<availableFormats>
20732091
<dateFormatItem id="Bh">h B</dateFormatItem>
@@ -2638,6 +2656,9 @@ annotations.
26382656
<dateTimeFormat type="atTime">
26392657
<pattern>{1} 'at' {0}</pattern>
26402658
</dateTimeFormat>
2659+
<dateTimeFormat type="relative">
2660+
<pattern>{1} 'at' {0}</pattern>
2661+
</dateTimeFormat>
26412662
</dateTimeFormatLength>
26422663
<dateTimeFormatLength type="long">
26432664
<dateTimeFormat>
@@ -2646,6 +2667,9 @@ annotations.
26462667
<dateTimeFormat type="atTime">
26472668
<pattern>{1} 'at' {0}</pattern>
26482669
</dateTimeFormat>
2670+
<dateTimeFormat type="relative">
2671+
<pattern>{1} 'at' {0}</pattern>
2672+
</dateTimeFormat>
26492673
</dateTimeFormatLength>
26502674
<dateTimeFormatLength type="medium">
26512675
<dateTimeFormat>
@@ -2654,6 +2678,9 @@ annotations.
26542678
<dateTimeFormat type="atTime">
26552679
<pattern>{1}, {0}</pattern>
26562680
</dateTimeFormat>
2681+
<dateTimeFormat type="relative">
2682+
<pattern>{1}, {0}</pattern>
2683+
</dateTimeFormat>
26572684
</dateTimeFormatLength>
26582685
<dateTimeFormatLength type="short">
26592686
<dateTimeFormat>
@@ -2662,6 +2689,9 @@ annotations.
26622689
<dateTimeFormat type="atTime">
26632690
<pattern>{1}, {0}</pattern>
26642691
</dateTimeFormat>
2692+
<dateTimeFormat type="relative">
2693+
<pattern>{1}, {0}</pattern>
2694+
</dateTimeFormat>
26652695
</dateTimeFormatLength>
26662696
<availableFormats>
26672697
<dateFormatItem id="Bh">h B</dateFormatItem>
@@ -3230,6 +3260,9 @@ annotations.
32303260
<dateTimeFormat type="atTime">
32313261
<pattern>{1} {0}</pattern>
32323262
</dateTimeFormat>
3263+
<dateTimeFormat type="relative">
3264+
<pattern>{1} {0}</pattern>
3265+
</dateTimeFormat>
32333266
</dateTimeFormatLength>
32343267
<dateTimeFormatLength type="long">
32353268
<dateTimeFormat>
@@ -3238,6 +3271,9 @@ annotations.
32383271
<dateTimeFormat type="atTime">
32393272
<pattern>{1} {0}</pattern>
32403273
</dateTimeFormat>
3274+
<dateTimeFormat type="relative">
3275+
<pattern>{1} {0}</pattern>
3276+
</dateTimeFormat>
32413277
</dateTimeFormatLength>
32423278
<dateTimeFormatLength type="medium">
32433279
<dateTimeFormat>
@@ -3246,6 +3282,9 @@ annotations.
32463282
<dateTimeFormat type="atTime">
32473283
<pattern>{1} {0}</pattern>
32483284
</dateTimeFormat>
3285+
<dateTimeFormat type="relative">
3286+
<pattern>{1} {0}</pattern>
3287+
</dateTimeFormat>
32493288
</dateTimeFormatLength>
32503289
<dateTimeFormatLength type="short">
32513290
<dateTimeFormat>
@@ -3254,6 +3293,9 @@ annotations.
32543293
<dateTimeFormat type="atTime">
32553294
<pattern>{1} {0}</pattern>
32563295
</dateTimeFormat>
3296+
<dateTimeFormat type="relative">
3297+
<pattern>{1} {0}</pattern>
3298+
</dateTimeFormat>
32573299
</dateTimeFormatLength>
32583300
<availableFormats>
32593301
<dateFormatItem id="Bh">h B</dateFormatItem>

‎common/main/hi.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,6 +1547,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
15471547
<dateTimeFormat type="atTime">
15481548
<pattern>{1} को {0} बजे</pattern>
15491549
</dateTimeFormat>
1550+
<dateTimeFormat type="relative">
1551+
<pattern draft="contributed">↑↑↑</pattern>
1552+
</dateTimeFormat>
15501553
</dateTimeFormatLength>
15511554
<dateTimeFormatLength type="long">
15521555
<dateTimeFormat>
@@ -1555,6 +1558,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
15551558
<dateTimeFormat type="atTime">
15561559
<pattern>{1} को {0} बजे</pattern>
15571560
</dateTimeFormat>
1561+
<dateTimeFormat type="relative">
1562+
<pattern draft="contributed">↑↑↑</pattern>
1563+
</dateTimeFormat>
15581564
</dateTimeFormatLength>
15591565
<dateTimeFormatLength type="medium">
15601566
<dateTimeFormat>
@@ -1563,6 +1569,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
15631569
<dateTimeFormat type="atTime">
15641570
<pattern>↑↑↑</pattern>
15651571
</dateTimeFormat>
1572+
<dateTimeFormat type="relative">
1573+
<pattern draft="contributed">↑↑↑</pattern>
1574+
</dateTimeFormat>
15661575
</dateTimeFormatLength>
15671576
<dateTimeFormatLength type="short">
15681577
<dateTimeFormat>
@@ -1571,6 +1580,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
15711580
<dateTimeFormat type="atTime">
15721581
<pattern>↑↑↑</pattern>
15731582
</dateTimeFormat>
1583+
<dateTimeFormat type="relative">
1584+
<pattern draft="contributed">↑↑↑</pattern>
1585+
</dateTimeFormat>
15741586
</dateTimeFormatLength>
15751587
<availableFormats>
15761588
<dateFormatItem id="Bh">B h</dateFormatItem>
@@ -2107,6 +2119,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
21072119
<dateTimeFormat type="atTime">
21082120
<pattern>{1} को {0} बजे</pattern>
21092121
</dateTimeFormat>
2122+
<dateTimeFormat type="relative">
2123+
<pattern draft="contributed">↑↑↑</pattern>
2124+
</dateTimeFormat>
21102125
</dateTimeFormatLength>
21112126
<dateTimeFormatLength type="long">
21122127
<dateTimeFormat>
@@ -2115,6 +2130,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
21152130
<dateTimeFormat type="atTime">
21162131
<pattern>{1} को {0} बजे</pattern>
21172132
</dateTimeFormat>
2133+
<dateTimeFormat type="relative">
2134+
<pattern draft="contributed">↑↑↑</pattern>
2135+
</dateTimeFormat>
21182136
</dateTimeFormatLength>
21192137
<dateTimeFormatLength type="medium">
21202138
<dateTimeFormat>
@@ -2123,6 +2141,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
21232141
<dateTimeFormat type="atTime">
21242142
<pattern>↑↑↑</pattern>
21252143
</dateTimeFormat>
2144+
<dateTimeFormat type="relative">
2145+
<pattern draft="contributed">↑↑↑</pattern>
2146+
</dateTimeFormat>
21262147
</dateTimeFormatLength>
21272148
<dateTimeFormatLength type="short">
21282149
<dateTimeFormat>
@@ -2131,6 +2152,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
21312152
<dateTimeFormat type="atTime">
21322153
<pattern>↑↑↑</pattern>
21332154
</dateTimeFormat>
2155+
<dateTimeFormat type="relative">
2156+
<pattern draft="contributed">↑↑↑</pattern>
2157+
</dateTimeFormat>
21342158
</dateTimeFormatLength>
21352159
<availableFormats>
21362160
<dateFormatItem id="Bh">B h</dateFormatItem>

‎common/main/or.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,6 +1227,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
12271227
<dateTimeFormat type="atTime">
12281228
<pattern>{1} ରେ {0}</pattern>
12291229
</dateTimeFormat>
1230+
<dateTimeFormat type="relative">
1231+
<pattern draft="contributed">↑↑↑</pattern>
1232+
</dateTimeFormat>
12301233
</dateTimeFormatLength>
12311234
<dateTimeFormatLength type="long">
12321235
<dateTimeFormat>
@@ -1235,6 +1238,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
12351238
<dateTimeFormat type="atTime">
12361239
<pattern>{1} ରେ {0}</pattern>
12371240
</dateTimeFormat>
1241+
<dateTimeFormat type="relative">
1242+
<pattern draft="contributed">↑↑↑</pattern>
1243+
</dateTimeFormat>
12381244
</dateTimeFormatLength>
12391245
<dateTimeFormatLength type="medium">
12401246
<dateTimeFormat>
@@ -1243,6 +1249,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
12431249
<dateTimeFormat type="atTime">
12441250
<pattern>↑↑↑</pattern>
12451251
</dateTimeFormat>
1252+
<dateTimeFormat type="relative">
1253+
<pattern draft="contributed">↑↑↑</pattern>
1254+
</dateTimeFormat>
12461255
</dateTimeFormatLength>
12471256
<dateTimeFormatLength type="short">
12481257
<dateTimeFormat>
@@ -1251,6 +1260,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
12511260
<dateTimeFormat type="atTime">
12521261
<pattern>↑↑↑</pattern>
12531262
</dateTimeFormat>
1263+
<dateTimeFormat type="relative">
1264+
<pattern draft="contributed">↑↑↑</pattern>
1265+
</dateTimeFormat>
12541266
</dateTimeFormatLength>
12551267
<availableFormats>
12561268
<dateFormatItem id="Bh">↑↑↑</dateFormatItem>
@@ -1727,6 +1739,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
17271739
<dateTimeFormat type="atTime">
17281740
<pattern>{0} ଠାରେ {1}</pattern>
17291741
</dateTimeFormat>
1742+
<dateTimeFormat type="relative">
1743+
<pattern draft="contributed">↑↑↑</pattern>
1744+
</dateTimeFormat>
17301745
</dateTimeFormatLength>
17311746
<dateTimeFormatLength type="long">
17321747
<dateTimeFormat>
@@ -1735,6 +1750,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
17351750
<dateTimeFormat type="atTime">
17361751
<pattern>{0} ଠାରେ {1}</pattern>
17371752
</dateTimeFormat>
1753+
<dateTimeFormat type="relative">
1754+
<pattern draft="contributed">↑↑↑</pattern>
1755+
</dateTimeFormat>
17381756
</dateTimeFormatLength>
17391757
<dateTimeFormatLength type="medium">
17401758
<dateTimeFormat>
@@ -1743,6 +1761,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
17431761
<dateTimeFormat type="atTime">
17441762
<pattern>↑↑↑</pattern>
17451763
</dateTimeFormat>
1764+
<dateTimeFormat type="relative">
1765+
<pattern draft="contributed">↑↑↑</pattern>
1766+
</dateTimeFormat>
17461767
</dateTimeFormatLength>
17471768
<dateTimeFormatLength type="short">
17481769
<dateTimeFormat>
@@ -1751,6 +1772,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
17511772
<dateTimeFormat type="atTime">
17521773
<pattern>↑↑↑</pattern>
17531774
</dateTimeFormat>
1775+
<dateTimeFormat type="relative">
1776+
<pattern draft="contributed">↑↑↑</pattern>
1777+
</dateTimeFormat>
17541778
</dateTimeFormatLength>
17551779
<availableFormats>
17561780
<dateFormatItem id="Bh">↑↑↑</dateFormatItem>

0 commit comments

Comments
 (0)