Skip to content

Commit 0e8f575

Browse files
sffcsffc
authored
CLDR-18369 Add and remove era codes to match Temporal specification (#4519)
1 parent 71ff748 commit 0e8f575

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎common/dtd/ldmlSupplemental.dtd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
275275
<!--@MATCH:time/yyyy-MM-dd-->
276276
<!--@VALUE-->
277277
<!ATTLIST era code NMTOKEN #IMPLIED >
278-
<!--@MATCH:regex/[a-z0-9]{3,8}(\-[a-z0-9]{3,8})*-->
278+
<!--@MATCH:regex/[a-z0-9]{2,8}(\-[a-z0-9]{3,8})*-->
279279
<!--@VALUE-->
280280
<!ATTLIST era aliases NMTOKENS #IMPLIED >
281281
<!--@MATCH:set/regex/[a-z0-9]{2,8}(\-[a-z0-9]{3,8})*-->

‎common/supplemental/supplementalData.xml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4305,8 +4305,8 @@ XXX Code for transations where no currency is involved
43054305
<calendar type="gregorian">
43064306
<calendarSystem type="solar" />
43074307
<eras>
4308-
<era type="0" end="0-12-31" code="gregory-inverse" aliases="bc bce"/>
4309-
<era type="1" start="1-01-01" code="gregory" aliases="ad ce"/>
4308+
<era type="0" end="0-12-31" code="bce" aliases="bc"/> <!-- Before Common Era, Before Christ -->
4309+
<era type="1" start="1-01-01" code="ce" aliases="ad"/> <!-- Common Era, Anno Domini -->
43104310
</eras>
43114311
</calendar>
43124312
<calendar type="generic"/>
@@ -4558,96 +4558,96 @@ XXX Code for transations where no currency is involved
45584558
<calendar type="islamic">
45594559
<calendarSystem type="lunar" />
45604560
<eras>
4561-
<era type="0" start="622-07-19" code="islamic" aliases="ah"/>
4562-
<era type="1" end="622-07-18" code="islamic-inverse" aliases="bh"/>
4561+
<era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
4562+
<era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
45634563
</eras>
45644564
</calendar>
45654565
<calendar type="islamic-civil">
45664566
<calendarSystem type="lunar" />
45674567
<eras>
4568-
<era type="0" start="622-07-19" code="islamic-civil" aliases="islamicc ah"/>
4569-
<era type="1" end="622-07-18" code="islamic-civil-inverse" aliases="bh"/>
4568+
<era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
4569+
<era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
45704570
</eras>
45714571
</calendar>
45724572
<calendar type="islamic-rgsa">
45734573
<calendarSystem type="lunar" />
45744574
<eras>
4575-
<era type="0" start="622-07-19" code="islamic-rgsa" aliases="ah"/>
4576-
<era type="1" end="622-07-18" code="islamic-rgsa-inverse" aliases="bh"/>
4575+
<era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
4576+
<era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
45774577
</eras>
45784578
</calendar>
45794579
<calendar type="islamic-tbla">
45804580
<calendarSystem type="lunar" />
45814581
<eras>
4582-
<era type="0" start="622-07-18" code="islamic-tbla" aliases="ah"/>
4583-
<era type="1" end="622-07-17" code="islamic-tbla-inverse" aliases="bh"/>
4582+
<era type="0" start="622-07-18" code="ah"/> <!-- Anno Hegirae -->
4583+
<era type="1" end="622-07-17" code="bh"/> <!-- Before Hijrah -->
45844584
</eras>
45854585
</calendar>
45864586
<calendar type="islamic-umalqura">
45874587
<calendarSystem type="lunar" />
45884588
<eras>
4589-
<era type="0" start="622-07-19" code="islamic-umalqura" aliases="ah"/>
4590-
<era type="1" end="622-07-18" code="islamic-umalqura-inverse" aliases="bh"/>
4589+
<era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
4590+
<era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
45914591
</eras>
45924592
</calendar>
45934593
<calendar type="chinese">
45944594
<calendarSystem type="lunisolar"/>
45954595
<eras>
4596-
<era type="0" start="-2636-02-15" code="chinese"/> <!-- 'sequential' year -->
4596+
<era type="0" start="-2636-02-15"/> <!-- 'sequential' year -->
45974597
</eras>
45984598
</calendar>
45994599
<calendar type="hebrew">
46004600
<calendarSystem type="lunisolar"/>
46014601
<eras>
4602-
<era type="0" start="-3760-09-07" code="hebrew" aliases="am"/>
4602+
<era type="0" start="-3760-09-07" code="am"/> <!-- Anno Mundi -->
46034603
</eras>
46044604
</calendar>
46054605
<calendar type="buddhist">
46064606
<calendarSystem type="solar" />
46074607
<eras>
4608-
<era type="0" start="-542-01-01" code="buddhist" aliases="be"/>
4608+
<era type="0" start="-542-01-01" code="be"/> <!-- Buddhist Era -->
46094609
</eras>
46104610
</calendar>
46114611
<calendar type="coptic">
46124612
<calendarSystem type="other"/>
46134613
<eras>
4614-
<era type="0" end="284-08-28" code="coptic-inverse"/>
4615-
<era type="1" start="284-08-29" code="coptic"/>
4614+
<era type="0" end="284-08-28" code="bd"/> <!-- Before Diocletian. NOTE: No evidence this era is used -->
4615+
<era type="1" start="284-08-29" code="am"/> <!-- Anno Martyrum -->
46164616
</eras>
46174617
</calendar>
46184618
<calendar type="persian">
46194619
<calendarSystem type="solar"/>
46204620
<eras>
4621-
<era type="0" start="622-03-21" code="persian" aliases="ap"/>
4621+
<era type="0" start="622-03-21" code="ap"/> <!-- Anno Persico -->
46224622
</eras>
46234623
</calendar>
46244624
<calendar type="dangi">
46254625
<calendarSystem type="lunisolar"/>
46264626
<eras>
4627-
<era type="0" start="-2332-02-15" code="dangi"/> <!-- 'sequential' year -->
4627+
<era type="0" start="-2332-02-15"/> <!-- 'sequential' year -->
46284628
</eras>
46294629
</calendar>
46304630
<calendar type="ethiopic">
46314631
<calendarSystem type="other"/>
46324632
<eras>
4633-
<era type="0" start="-5492-07-17" code="ethioaa" aliases="ethiopic-amete-alem mundi"/>
4634-
<era type="1" start="8-08-27" code="ethiopic" aliases="incar"/>
4633+
<era type="0" start="-5492-07-17" code="aa"/> <!-- Amete Alem -->
4634+
<era type="1" start="8-08-27" code="am"/> <!-- Amete Mihret -->
46354635
</eras>
46364636
</calendar>
46374637
<calendar type="ethiopic-amete-alem">
46384638
<eras>
4639-
<era type="0" start="-5492-07-17" code="ethioaa" aliases="ethiopic-amete-alem mundi"/>
4639+
<era type="0" start="-5492-07-17" code="aa"/> <!-- Amete Alem -->
46404640
</eras>
46414641
</calendar>
46424642
<calendar type="indian">
46434643
<eras>
4644-
<era type="0" start="79-03-22" code="indian" aliases="saka"/>
4644+
<era type="0" start="79-03-22" code="shaka"/>
46454645
</eras>
46464646
</calendar>
46474647
<calendar type="roc">
46484648
<eras>
4649-
<era type="0" end="1911-12-31" code="roc-inverse" aliases="before-roc"/>
4650-
<era type="1" start="1912-01-01" code="roc" aliases="minguo"/>
4649+
<era type="0" end="1911-12-31" code="broc"/>
4650+
<era type="1" start="1912-01-01" code="roc"/>
46514651
</eras>
46524652
</calendar>
46534653

0 commit comments

Comments
 (0)