Skip to content

Commit 7fd31d9

Browse files
committed
Sync the code/aliases to CLDR PR2665
The final version of unicode-org/cldr#2665 change slightly after we draft the spec before the review complete. Sync to the landed version.
1 parent 3c73e7a commit 7fd31d9

File tree

2 files changed

+92
-92
lines changed

2 files changed

+92
-92
lines changed

index.html

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2524,7 +2524,7 @@
25242524
</ul></div><div id="menu-toggle"><svg xmlns="http://www.w3.org/2000/svg" style="width:100%; height:100%; stroke:currentColor" viewBox="0 0 120 120">
25252525
<title>Menu</title>
25262526
<path stroke-width="10" stroke-linecap="round" d="M30,60 h60 M30,30 m0,5 h60 M30,90 m0,-5 h60"></path>
2527-
</svg></div><div id="menu-spacer"></div><div id="menu"><div id="menu-search"><input type="text" id="menu-search-box" placeholder="Search..."><div id="menu-search-results" class="inactive"></div></div><div id="menu-pins"><div class="menu-pane-header">Pins</div><ul id="menu-pins-list"></ul></div><div class="menu-pane-header">Table of Contents</div><div id="menu-toc"><ol class="toc"><li><span class="item-toggle">◢</span><a href="#sup-temporal-calendar-abstract-ops" title="Abstract Operations for Temporal.Calendar Objects"><span class="secnum">1</span> Abstract Operations for Temporal.Calendar Objects</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-temporal-iscalendarsupportera" title="IsCalendarSupportEra ( calendar )"><span class="secnum">1.1</span> IsCalendarSupportEra ( <var>calendar</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-temporal-canonicalizeeraincalendar" title="CanonicalizeEraInCalendar ( calendar, era )"><span class="secnum">1.2</span> CanonicalizeEraInCalendar ( <var>calendar</var>, <var>era</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-temporal-isvalidmonthecodeforcalendar" title="IsValidMonthCodeForCalendar ( calendar, monthCode )"><span class="secnum">1.3</span> IsValidMonthCodeForCalendar ( <var>calendar</var>, <var>monthCode</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-temporal-isvaliderayearforcalendar" title="IsValidEraYearForCalendar ( calendar, era, eraYear )"><span class="secnum">1.4</span> IsValidEraYearForCalendar ( <var>calendar</var>, <var>era</var>, <var>eraYear</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sup-temporal-calendardateera" title="CalendarDateEra ( calendar, date )"><span class="secnum">1.5</span> CalendarDateEra ( <var>calendar</var>, <var>date</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sup-temporal-calendardateerayear" title="CalendarDateEraYear ( calendar, date )"><span class="secnum">1.6</span> CalendarDateEraYear ( <var>calendar</var>, <var>date</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sup-temporal-calendardatefields" title="CalendarDateFields ( calendar, fields )"><span class="secnum">1.7</span> CalendarDateFields ( <var>calendar</var>, <var>fields</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sup-temporal-calendardatemergefields" title="CalendarDateMergeFields ( calendar, fields, additionalFields )"><span class="secnum">1.8</span> CalendarDateMergeFields ( <var>calendar</var>, <var>fields</var>, <var>additionalFields</var> )</a></li></ol></li><li><span class="item-toggle-none"></span><a href="#sec-copyright-and-software-license" title="Copyright &amp; Software License"><span class="secnum">A</span> Copyright &amp; Software License</a></li></ol></div></div><div id="spec-container"><h1 class="version">Stage 0 Draft / February 6, 2023</h1><h1 class="title">Intl era and monthCode Proposal</h1>
2527+
</svg></div><div id="menu-spacer"></div><div id="menu"><div id="menu-search"><input type="text" id="menu-search-box" placeholder="Search..."><div id="menu-search-results" class="inactive"></div></div><div id="menu-pins"><div class="menu-pane-header">Pins</div><ul id="menu-pins-list"></ul></div><div class="menu-pane-header">Table of Contents</div><div id="menu-toc"><ol class="toc"><li><span class="item-toggle">◢</span><a href="#sup-temporal-calendar-abstract-ops" title="Abstract Operations for Temporal.Calendar Objects"><span class="secnum">1</span> Abstract Operations for Temporal.Calendar Objects</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-temporal-iscalendarsupportera" title="IsCalendarSupportEra ( calendar )"><span class="secnum">1.1</span> IsCalendarSupportEra ( <var>calendar</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-temporal-canonicalizeeraincalendar" title="CanonicalizeEraInCalendar ( calendar, era )"><span class="secnum">1.2</span> CanonicalizeEraInCalendar ( <var>calendar</var>, <var>era</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-temporal-isvalidmonthecodeforcalendar" title="IsValidMonthCodeForCalendar ( calendar, monthCode )"><span class="secnum">1.3</span> IsValidMonthCodeForCalendar ( <var>calendar</var>, <var>monthCode</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-temporal-isvaliderayearforcalendar" title="IsValidEraYearForCalendar ( calendar, era, eraYear )"><span class="secnum">1.4</span> IsValidEraYearForCalendar ( <var>calendar</var>, <var>era</var>, <var>eraYear</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sup-temporal-calendardateera" title="CalendarDateEra ( calendar, date )"><span class="secnum">1.5</span> CalendarDateEra ( <var>calendar</var>, <var>date</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sup-temporal-calendardateerayear" title="CalendarDateEraYear ( calendar, date )"><span class="secnum">1.6</span> CalendarDateEraYear ( <var>calendar</var>, <var>date</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sup-temporal-calendardatefields" title="CalendarDateFields ( calendar, fields )"><span class="secnum">1.7</span> CalendarDateFields ( <var>calendar</var>, <var>fields</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sup-temporal-calendardatemergefields" title="CalendarDateMergeFields ( calendar, fields, additionalFields )"><span class="secnum">1.8</span> CalendarDateMergeFields ( <var>calendar</var>, <var>fields</var>, <var>additionalFields</var> )</a></li></ol></li><li><span class="item-toggle-none"></span><a href="#sec-copyright-and-software-license" title="Copyright &amp; Software License"><span class="secnum">A</span> Copyright &amp; Software License</a></li></ol></div></div><div id="spec-container"><h1 class="version">Stage 2 Draft / February 7, 2023</h1><h1 class="title">Intl era and monthCode Proposal</h1>
25282528
<emu-clause id="sup-temporal-calendar-abstract-ops">
25292529
<h1><span class="secnum">1</span> Abstract Operations for Temporal.Calendar Objects</h1>
25302530
<emu-clause id="sec-temporal-iscalendarsupportera" type="abstract operation" aoid="IsCalendarSupportEra">
@@ -2561,16 +2561,16 @@ <h1><span class="secnum">1.1</span> IsCalendarSupportEra ( <var>calendar</var> )
25612561
</tr>
25622562
<tr>
25632563
<td><emu-val>"coptic"</emu-val></td>
2564-
<td><emu-val>"pre-coptic"</emu-val></td>
2564+
<td><emu-val>"coptic"</emu-val></td>
25652565
<td></td>
2566-
<td>1</td>
2566+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
25672567
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
25682568
</tr>
25692569
<tr>
25702570
<td><emu-val>"coptic"</emu-val></td>
2571-
<td><emu-val>"coptic"</emu-val></td>
2571+
<td><emu-val>"coptic-inverse"</emu-val></td>
25722572
<td></td>
2573-
<td>1</td>
2573+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
25742574
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
25752575
</tr>
25762576
<tr>
@@ -2580,20 +2580,20 @@ <h1><span class="secnum">1.1</span> IsCalendarSupportEra ( <var>calendar</var> )
25802580
<td><emu-val>-∞</emu-val><sub>𝔽</sub></td>
25812581
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
25822582
</tr>
2583+
<tr>
2584+
<td><emu-val>"ethiopic"</emu-val></td>
2585+
<td><emu-val>"ethiopic"</emu-val></td>
2586+
<td><emu-val>"incar"</emu-val></td>
2587+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
2588+
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
2589+
</tr>
25832590
<tr>
25842591
<td><emu-val>"ethiopic"</emu-val></td>
25852592
<td><emu-val>"ethiopicaa"</emu-val></td>
25862593
<td><emu-val>"ethiopic-amete-alem"</emu-val>, <emu-val>"mundi"</emu-val></td>
25872594
<td><emu-val>-∞</emu-val><sub>𝔽</sub></td>
25882595
<td><emu-val>5500</emu-val><sub>𝔽</sub></td>
25892596
</tr>
2590-
<tr>
2591-
<td><emu-val>"ethiopic"</emu-val></td>
2592-
<td><emu-val>"ethiopic"</emu-val></td>
2593-
<td><emu-val>"incar"</emu-val></td>
2594-
<td>1</td>
2595-
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
2596-
</tr>
25972597
<tr>
25982598
<td><emu-val>"ethiopicaa"</emu-val></td>
25992599
<td><emu-val>"ethiopicaa"</emu-val></td>
@@ -2603,16 +2603,16 @@ <h1><span class="secnum">1.1</span> IsCalendarSupportEra ( <var>calendar</var> )
26032603
</tr>
26042604
<tr>
26052605
<td><emu-val>"gregory"</emu-val></td>
2606-
<td><emu-val>"pre-gregory"</emu-val></td>
2607-
<td><emu-val>"bc"</emu-val>, <emu-val>"bce"</emu-val></td>
2608-
<td>1</td>
2606+
<td><emu-val>"gregory"</emu-val></td>
2607+
<td><emu-val>"ce"</emu-val>, <emu-val>"ad"</emu-val></td>
2608+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
26092609
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
26102610
</tr>
26112611
<tr>
26122612
<td><emu-val>"gregory"</emu-val></td>
2613-
<td><emu-val>"gregory"</emu-val></td>
2614-
<td><emu-val>"ce"</emu-val>, <emu-val>"ad"</emu-val></td>
2615-
<td>1</td>
2613+
<td><emu-val>"gregory-inverse"</emu-val></td>
2614+
<td><emu-val>"bc"</emu-val>, <emu-val>"bce"</emu-val></td>
2615+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
26162616
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
26172617
</tr>
26182618
<tr>
@@ -2666,52 +2666,52 @@ <h1><span class="secnum">1.1</span> IsCalendarSupportEra ( <var>calendar</var> )
26662666
</tr>
26672667
<tr>
26682668
<td><emu-val>"japanese"</emu-val></td>
2669-
<td><emu-val>"bce"</emu-val></td>
2669+
<td><emu-val>"heisei"</emu-val></td>
26702670
<td></td>
2671-
<td>1</td>
2672-
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
2671+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
2672+
<td><emu-val>31</emu-val><sub>𝔽</sub></td>
26732673
</tr>
26742674
<tr>
26752675
<td><emu-val>"japanese"</emu-val></td>
2676-
<td><emu-val>"ce"</emu-val></td>
2677-
<td></td>
2678-
<td>1</td>
2679-
<td>TBD</td>
2676+
<td><emu-val>"japanese"</emu-val></td>
2677+
<td><emu-val>"gregory"</emu-val>, <emu-val>"ad"</emu-val>, <emu-val>"ce"</emu-val></td>
2678+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
2679+
<td><emu-val>1868</emu-val><sub>𝔽</sub></td>
26802680
</tr>
26812681
<tr>
26822682
<td><emu-val>"japanese"</emu-val></td>
2683-
<td><emu-val>"heisei"</emu-val></td>
2684-
<td><emu-val>"h"</emu-val></td>
2685-
<td>1</td>
2686-
<td>31</td>
2683+
<td><emu-val>"japanese-inverse"</emu-val></td>
2684+
<td><emu-val>"gregory-inverse"</emu-val>, <emu-val>"bc"</emu-val>, <emu-val>"bce"</emu-val></td>
2685+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
2686+
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
26872687
</tr>
26882688
<tr>
26892689
<td><emu-val>"japanese"</emu-val></td>
26902690
<td><emu-val>"meiji"</emu-val></td>
2691-
<td><emu-val>"m"</emu-val></td>
2692-
<td>1</td>
2693-
<td>45</td>
2691+
<td></td>
2692+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
2693+
<td><emu-val>45</emu-val><sub>𝔽</sub></td>
26942694
</tr>
26952695
<tr>
26962696
<td><emu-val>"japanese"</emu-val></td>
26972697
<td><emu-val>"reiwa"</emu-val></td>
2698-
<td><emu-val>"r"</emu-val></td>
2699-
<td>1</td>
2698+
<td></td>
2699+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
27002700
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
27012701
</tr>
27022702
<tr>
27032703
<td><emu-val>"japanese"</emu-val></td>
27042704
<td><emu-val>"showa"</emu-val></td>
2705-
<td><emu-val>"s"</emu-val></td>
2706-
<td>1</td>
2707-
<td>64</td>
2705+
<td></td>
2706+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
2707+
<td><emu-val>64</emu-val><sub>𝔽</sub></td>
27082708
</tr>
27092709
<tr>
27102710
<td><emu-val>"japanese"</emu-val></td>
27112711
<td><emu-val>"taisho"</emu-val></td>
2712-
<td><emu-val>"t"</emu-val></td>
2713-
<td>1</td>
2714-
<td>15</td>
2712+
<td></td>
2713+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
2714+
<td><emu-val>15</emu-val><sub>𝔽</sub></td>
27152715
</tr>
27162716
<tr>
27172717
<td><emu-val>"persian"</emu-val></td>
@@ -2722,16 +2722,16 @@ <h1><span class="secnum">1.1</span> IsCalendarSupportEra ( <var>calendar</var> )
27222722
</tr>
27232723
<tr>
27242724
<td><emu-val>"roc"</emu-val></td>
2725-
<td><emu-val>"pre-roc"</emu-val></td>
2726-
<td><emu-val>"broc"</emu-val></td>
2727-
<td>1</td>
2725+
<td><emu-val>"roc"</emu-val></td>
2726+
<td><emu-val>"minguo"</emu-val>*</td>
2727+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
27282728
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
27292729
</tr>
27302730
<tr>
27312731
<td><emu-val>"roc"</emu-val></td>
2732-
<td><emu-val>"roc"</emu-val></td>
2733-
<td><emu-val>"minguo"</emu-val>*</td>
2734-
<td>1</td>
2732+
<td><emu-val>"roc-inverse"</emu-val></td>
2733+
<td><emu-val>"before-roc"</emu-val></td>
2734+
<td><emu-val>1</emu-val><sub>𝔽</sub></td>
27352735
<td><emu-val>+∞</emu-val><sub>𝔽</sub></td>
27362736
</tr>
27372737
</tbody></table>

spec.emu

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<script src="./spec.js"></script>
66
<pre class="metadata">
77
title: Intl era and monthCode Proposal
8-
stage: 0
8+
stage: 2
99
location: https://frankyftang.github.io/proposal-intl-era-monthcode/
1010
copyright: true
1111
contributors: Google, Ecma International
@@ -56,16 +56,16 @@ contributors: Google, Ecma International
5656
</tr>
5757
<tr>
5858
<td>*"coptic"*</td>
59-
<td>*"pre-coptic"*</td>
59+
<td>*"coptic"*</td>
6060
<td></td>
61-
<td>1</td>
61+
<td>*1*<sub>𝔽</sub></td>
6262
<td>*+&infin;*<sub>𝔽</sub></td>
6363
</tr>
6464
<tr>
6565
<td>*"coptic"*</td>
66-
<td>*"coptic"*</td>
66+
<td>*"coptic-inverse"*</td>
6767
<td></td>
68-
<td>1</td>
68+
<td>*1*<sub>𝔽</sub></td>
6969
<td>*+&infin;*<sub>𝔽</sub></td>
7070
</tr>
7171
<tr>
@@ -75,20 +75,20 @@ contributors: Google, Ecma International
7575
<td>*-&infin;*<sub>𝔽</sub></td>
7676
<td>*+&infin;*<sub>𝔽</sub></td>
7777
</tr>
78+
<tr>
79+
<td>*"ethiopic"*</td>
80+
<td>*"ethiopic"*</td>
81+
<td>*"incar"*</td>
82+
<td>*1*<sub>𝔽</sub></td>
83+
<td>*+&infin;*<sub>𝔽</sub></td>
84+
</tr>
7885
<tr>
7986
<td>*"ethiopic"*</td>
8087
<td>*"ethiopicaa"*</td>
8188
<td>*"ethiopic-amete-alem"*, *"mundi"*</td>
8289
<td>*-&infin;*<sub>𝔽</sub></td>
8390
<td>*5500*<sub>𝔽</sub></td>
8491
</tr>
85-
<tr>
86-
<td>*"ethiopic"*</td>
87-
<td>*"ethiopic"*</td>
88-
<td>*"incar"*</td>
89-
<td>1</td>
90-
<td>*+&infin;*<sub>𝔽</sub></td>
91-
</tr>
9292
<tr>
9393
<td>*"ethiopicaa"*</td>
9494
<td>*"ethiopicaa"*</td>
@@ -98,16 +98,16 @@ contributors: Google, Ecma International
9898
</tr>
9999
<tr>
100100
<td>*"gregory"*</td>
101-
<td>*"pre-gregory"*</td>
102-
<td>*"bc"*, *"bce"*</td>
103-
<td>1</td>
101+
<td>*"gregory"*</td>
102+
<td>*"ce"*, *"ad"*</td>
103+
<td>*1*<sub>𝔽</sub></td>
104104
<td>*+&infin;*<sub>𝔽</sub></td>
105105
</tr>
106106
<tr>
107107
<td>*"gregory"*</td>
108-
<td>*"gregory"*</td>
109-
<td>*"ce"*, *"ad"*</td>
110-
<td>1</td>
108+
<td>*"gregory-inverse"*</td>
109+
<td>*"bc"*, *"bce"*</td>
110+
<td>*1*<sub>𝔽</sub></td>
111111
<td>*+&infin;*<sub>𝔽</sub></td>
112112
</tr>
113113
<tr>
@@ -161,52 +161,52 @@ contributors: Google, Ecma International
161161
</tr>
162162
<tr>
163163
<td>*"japanese"*</td>
164-
<td>*"bce"*</td>
164+
<td>*"heisei"*</td>
165165
<td></td>
166-
<td>1</td>
167-
<td>*+&infin;*<sub>𝔽</sub></td>
166+
<td>*1*<sub>𝔽</sub></td>
167+
<td>*31*<sub>𝔽</sub></td>
168168
</tr>
169169
<tr>
170170
<td>*"japanese"*</td>
171-
<td>*"ce"*</td>
172-
<td></td>
173-
<td>1</td>
174-
<td>TBD</td>
171+
<td>*"japanese"*</td>
172+
<td>*"gregory"*, *"ad"*, *"ce"*</td>
173+
<td>*1*<sub>𝔽</sub></td>
174+
<td>*1868*<sub>𝔽</sub></td>
175175
</tr>
176176
<tr>
177177
<td>*"japanese"*</td>
178-
<td>*"heisei"*</td>
179-
<td>*"h"*</td>
180-
<td>1</td>
181-
<td>31</td>
178+
<td>*"japanese-inverse"*</td>
179+
<td>*"gregory-inverse"*, *"bc"*, *"bce"*</td>
180+
<td>*1*<sub>𝔽</sub></td>
181+
<td>*+&infin;*<sub>𝔽</sub></td>
182182
</tr>
183183
<tr>
184184
<td>*"japanese"*</td>
185185
<td>*"meiji"*</td>
186-
<td>*"m"*</td>
187-
<td>1</td>
188-
<td>45</td>
186+
<td></td>
187+
<td>*1*<sub>𝔽</sub></td>
188+
<td>*45*<sub>𝔽</sub></td>
189189
</tr>
190190
<tr>
191191
<td>*"japanese"*</td>
192192
<td>*"reiwa"*</td>
193-
<td>*"r"*</td>
194-
<td>1</td>
193+
<td></td>
194+
<td>*1*<sub>𝔽</sub></td>
195195
<td>*+&infin;*<sub>𝔽</sub></td>
196196
</tr>
197197
<tr>
198198
<td>*"japanese"*</td>
199199
<td>*"showa"*</td>
200-
<td>*"s"*</td>
201-
<td>1</td>
202-
<td>64</td>
200+
<td></td>
201+
<td>*1*<sub>𝔽</sub></td>
202+
<td>*64*<sub>𝔽</sub></td>
203203
</tr>
204204
<tr>
205205
<td>*"japanese"*</td>
206206
<td>*"taisho"*</td>
207-
<td>*"t"*</td>
208-
<td>1</td>
209-
<td>15</td>
207+
<td></td>
208+
<td>*1*<sub>𝔽</sub></td>
209+
<td>*15*<sub>𝔽</sub></td>
210210
</tr>
211211
<tr>
212212
<td>*"persian"*</td>
@@ -217,16 +217,16 @@ contributors: Google, Ecma International
217217
</tr>
218218
<tr>
219219
<td>*"roc"*</td>
220-
<td>*"pre-roc"*</td>
221-
<td>*"broc"*</td>
222-
<td>1</td>
220+
<td>*"roc"*</td>
221+
<td>*"minguo"**</td>
222+
<td>*1*<sub>𝔽</sub></td>
223223
<td>*+&infin;*<sub>𝔽</sub></td>
224224
</tr>
225225
<tr>
226226
<td>*"roc"*</td>
227-
<td>*"roc"*</td>
228-
<td>*"minguo"**</td>
229-
<td>1</td>
227+
<td>*"roc-inverse"*</td>
228+
<td>*"before-roc"*</td>
229+
<td>*1*<sub>𝔽</sub></td>
230230
<td>*+&infin;*<sub>𝔽</sub></td>
231231
</tr>
232232
</table>

0 commit comments

Comments
 (0)