Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Normative: Change the hourCycle default logic #758

Merged
merged 8 commits into from
Sep 27, 2023
Merged

Normative: Change the hourCycle default logic #758

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d39f03a
Normative: Change the hourCycle default logic
FrankYFTang Mar 13, 2023
e154537
simplified
FrankYFTang Mar 13, 2023
ca8280a
address ja case
FrankYFTang Mar 13, 2023
b7ef7da
rework to anba'suggestion
FrankYFTang Apr 6, 2023
3d550bf
Update spec/datetimeformat.html
FrankYFTang Apr 6, 2023
5eac65b
Update spec/datetimeformat.html
FrankYFTang Apr 6, 2023
66ab756
Update spec/datetimeformat.html
ryzokuken Sep 27, 2023
dfde222
Update spec/datetimeformat.html
ryzokuken Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions spec/datetimeformat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,14 @@ <h1>InitializeDateTimeFormat ( _dateTimeFormat_, _locales_, _options_ )</h1>
1. Set _dateTimeFormat_.[[NumberingSystem]] to _r_.[[nu]].
1. Let _dataLocale_ be _r_.[[dataLocale]].
1. Let _dataLocaleData_ be _localeData_.[[&lt;_dataLocale_&gt;]].
1. Let _hcDefault_ be _dataLocaleData_.[[hourCycle]].
1. If _hour12_ is *true*, then
1. If _hcDefault_ is *"h11"* or *"h23"*, let _hc_ be *"h11"*. Otherwise, let _hc_ be *"h12"*.
1. Let _hc_ be _dataLocaleData_.[[hourCycle12]].
1. Else if _hour12_ is *false*, then
1. If _hcDefault_ is *"h11"* or *"h23"*, let _hc_ be *"h23"*. Otherwise, let _hc_ be *"h24"*.
1. Let _hc_ be _dataLocaleData_.[[hourCycle24]].
1. Else,
1. Assert: _hour12_ is *undefined*.
1. Let _hc_ be _r_.[[hc]].
1. If _hc_ is *null*, set _hc_ to _hcDefault_.
1. If _hc_ is *null*, set _hc_ to _dataLocaleData_.[[hourCycle]].
1. Set _dateTimeFormat_.[[HourCycle]] to _hc_.
1. Let _timeZone_ be ? Get(_options_, *"timeZone"*).
1. If _timeZone_ is *undefined*, then
Expand Down Expand Up @@ -205,6 +204,12 @@ <h1>Internal slots</h1>
<li>
[[LocaleData]].[[&lt;_locale_&gt;]].[[hourCycle]] must be a String value equal to *"h11"*, *"h12"*, *"h23"*, or *"h24"*.
</li>
<li>
[[LocaleData]].[[&lt;_locale_&gt;]].[[hourCycle12]] must be a String value equal to *"h11"* or *"h12"*.
</li>
<li>
[[LocaleData]].[[&lt;_locale_&gt;]].[[hourCycle24]] must be a String value equal to *"h23"* or *"h24"*.
</li>
<li>
[[LocaleData]].[[&lt;_locale_&gt;]] must have a [[formats]] field. This [[formats]] field must be a Record with [[&lt;_calendar_&gt;]] fields for all calendar values _calendar_. The value of this field must be a list of records, each of which has a subset of the fields shown in <emu-xref href="#table-datetimeformat-components"></emu-xref>, where each field must have one of the values specified for the field in <emu-xref href="#table-datetimeformat-components"></emu-xref>. Multiple records in a list may use the same subset of the fields as long as they have different values for the fields. The following subsets must be available for each locale:
<ul>
Expand Down
Loading