Skip to content

Commit 53e60ab

Browse files
sffcSquash Bot
sffc
authored and
Squash Bot
committed
CLDR-18369 Revise era codes to match Temporal specification
See #4519
1 parent d2293cc commit 53e60ab

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
@@ -4304,8 +4304,8 @@ XXX Code for transations where no currency is involved
43044304
<calendar type="gregorian">
43054305
<calendarSystem type="solar" />
43064306
<eras>
4307-
<era type="0" end="0-12-31" code="gregory-inverse" aliases="bc bce"/>
4308-
<era type="1" start="1-01-01" code="gregory" aliases="ad ce"/>
4307+
<era type="0" end="0-12-31" code="bce" aliases="bc"/> <!-- Before Common Era, Before Christ -->
4308+
<era type="1" start="1-01-01" code="ce" aliases="ad"/> <!-- Common Era, Anno Domini -->
43094309
</eras>
43104310
</calendar>
43114311
<calendar type="generic"/>
@@ -4557,96 +4557,96 @@ XXX Code for transations where no currency is involved
45574557
<calendar type="islamic">
45584558
<calendarSystem type="lunar" />
45594559
<eras>
4560-
<era type="0" start="622-07-19" code="islamic" aliases="ah"/>
4561-
<era type="1" end="622-07-18" code="islamic-inverse" aliases="bh"/>
4560+
<era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
4561+
<era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
45624562
</eras>
45634563
</calendar>
45644564
<calendar type="islamic-civil">
45654565
<calendarSystem type="lunar" />
45664566
<eras>
4567-
<era type="0" start="622-07-19" code="islamic-civil" aliases="islamicc ah"/>
4568-
<era type="1" end="622-07-18" code="islamic-civil-inverse" aliases="bh"/>
4567+
<era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
4568+
<era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
45694569
</eras>
45704570
</calendar>
45714571
<calendar type="islamic-rgsa">
45724572
<calendarSystem type="lunar" />
45734573
<eras>
4574-
<era type="0" start="622-07-19" code="islamic-rgsa" aliases="ah"/>
4575-
<era type="1" end="622-07-18" code="islamic-rgsa-inverse" aliases="bh"/>
4574+
<era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
4575+
<era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
45764576
</eras>
45774577
</calendar>
45784578
<calendar type="islamic-tbla">
45794579
<calendarSystem type="lunar" />
45804580
<eras>
4581-
<era type="0" start="622-07-18" code="islamic-tbla" aliases="ah"/>
4582-
<era type="1" end="622-07-17" code="islamic-tbla-inverse" aliases="bh"/>
4581+
<era type="0" start="622-07-18" code="ah"/> <!-- Anno Hegirae -->
4582+
<era type="1" end="622-07-17" code="bh"/> <!-- Before Hijrah -->
45834583
</eras>
45844584
</calendar>
45854585
<calendar type="islamic-umalqura">
45864586
<calendarSystem type="lunar" />
45874587
<eras>
4588-
<era type="0" start="622-07-19" code="islamic-umalqura" aliases="ah"/>
4589-
<era type="1" end="622-07-18" code="islamic-umalqura-inverse" aliases="bh"/>
4588+
<era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
4589+
<era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
45904590
</eras>
45914591
</calendar>
45924592
<calendar type="chinese">
45934593
<calendarSystem type="lunisolar"/>
45944594
<eras>
4595-
<era type="0" start="-2636-02-15" code="chinese"/> <!-- 'sequential' year -->
4595+
<era type="0" start="-2636-02-15"/> <!-- 'sequential' year -->
45964596
</eras>
45974597
</calendar>
45984598
<calendar type="hebrew">
45994599
<calendarSystem type="lunisolar"/>
46004600
<eras>
4601-
<era type="0" start="-3760-09-07" code="hebrew" aliases="am"/>
4601+
<era type="0" start="-3760-09-07" code="am"/> <!-- Anno Mundi -->
46024602
</eras>
46034603
</calendar>
46044604
<calendar type="buddhist">
46054605
<calendarSystem type="solar" />
46064606
<eras>
4607-
<era type="0" start="-542-01-01" code="buddhist" aliases="be"/>
4607+
<era type="0" start="-542-01-01" code="be"/> <!-- Buddhist Era -->
46084608
</eras>
46094609
</calendar>
46104610
<calendar type="coptic">
46114611
<calendarSystem type="other"/>
46124612
<eras>
4613-
<era type="0" end="284-08-28" code="coptic-inverse"/>
4614-
<era type="1" start="284-08-29" code="coptic"/>
4613+
<era type="0" end="284-08-28" code="bd"/> <!-- Before Diocletian. NOTE: No evidence this era is used -->
4614+
<era type="1" start="284-08-29" code="am"/> <!-- Anno Martyrum -->
46154615
</eras>
46164616
</calendar>
46174617
<calendar type="persian">
46184618
<calendarSystem type="solar"/>
46194619
<eras>
4620-
<era type="0" start="622-03-21" code="persian" aliases="ap"/>
4620+
<era type="0" start="622-03-21" code="ap"/> <!-- Anno Persico -->
46214621
</eras>
46224622
</calendar>
46234623
<calendar type="dangi">
46244624
<calendarSystem type="lunisolar"/>
46254625
<eras>
4626-
<era type="0" start="-2332-02-15" code="dangi"/> <!-- 'sequential' year -->
4626+
<era type="0" start="-2332-02-15"/> <!-- 'sequential' year -->
46274627
</eras>
46284628
</calendar>
46294629
<calendar type="ethiopic">
46304630
<calendarSystem type="other"/>
46314631
<eras>
4632-
<era type="0" start="-5492-07-17" code="ethioaa" aliases="ethiopic-amete-alem mundi"/>
4633-
<era type="1" start="8-08-27" code="ethiopic" aliases="incar"/>
4632+
<era type="0" start="-5492-07-17" code="aa"/> <!-- Amete Alem -->
4633+
<era type="1" start="8-08-27" code="am"/> <!-- Amete Mihret -->
46344634
</eras>
46354635
</calendar>
46364636
<calendar type="ethiopic-amete-alem">
46374637
<eras>
4638-
<era type="0" start="-5492-07-17" code="ethioaa" aliases="ethiopic-amete-alem mundi"/>
4638+
<era type="0" start="-5492-07-17" code="aa"/> <!-- Amete Alem -->
46394639
</eras>
46404640
</calendar>
46414641
<calendar type="indian">
46424642
<eras>
4643-
<era type="0" start="79-03-22" code="indian" aliases="saka"/>
4643+
<era type="0" start="79-03-22" code="shaka"/>
46444644
</eras>
46454645
</calendar>
46464646
<calendar type="roc">
46474647
<eras>
4648-
<era type="0" end="1911-12-31" code="roc-inverse" aliases="before-roc"/>
4649-
<era type="1" start="1912-01-01" code="roc" aliases="minguo"/>
4648+
<era type="0" end="1911-12-31" code="broc"/>
4649+
<era type="1" start="1912-01-01" code="roc"/>
46504650
</eras>
46514651
</calendar>
46524652

0 commit comments

Comments
 (0)