Editorial: Replace all remaining uses of DataLocale

spec/collator.html

@@ -74,9 +74,9 @@ <h1>
           1. If _usage_ is *"sort"*, then
             1. Set _sensitivity_ to *"variant"*.
           1. Else,
-            1. Let _dataLocale_ be GetLocaleBaseName(_r_.[[locale]]).
-            1. Let _dataLocaleData_ be _localeData_.[[&lt;_dataLocale_&gt;]].
-            1. Set _sensitivity_ to _dataLocaleData_.[[sensitivity]].
+            1. Let _resolvedLocaleBaseName_ be GetLocaleBaseName(_r_.[[locale]]).
+            1. Let _resolvedLocaleData_ be _localeData_.[[&lt;_resolvedLocaleBaseName_&gt;]].
+            1. Set _sensitivity_ to _resolvedLocaleData_.[[sensitivity]].
         1. Set _collator_.[[Sensitivity]] to _sensitivity_.
         1. Let _ignorePunctuation_ be ? GetOption(_options_, *"ignorePunctuation"*, ~boolean~, ~empty~, *false*).
         1. Set _collator_.[[IgnorePunctuation]] to _ignorePunctuation_.

spec/datetimeformat.html

@@ -85,16 +85,16 @@ <h1>
         1. Let _resolvedCalendar_ be _r_.[[ca]].
         1. Set _dateTimeFormat_.[[Calendar]] to _resolvedCalendar_.
         1. Set _dateTimeFormat_.[[NumberingSystem]] to _r_.[[nu]].
-        1. Let _dataLocale_ be GetLocaleBaseName(_r_.[[locale]]).
-        1. Let _dataLocaleData_ be _localeData_.[[&lt;_dataLocale_&gt;]].
+        1. Let _resolvedLocaleBaseName_ be GetLocaleBaseName(_r_.[[locale]]).
+        1. Let _resolvedLocaleData_ be _localeData_.[[&lt;_resolvedLocaleBaseName_&gt;]].
         1. If _hour12_ is *true*, then
-          1. Let _hc_ be _dataLocaleData_.[[hourCycle12]].
+          1. Let _hc_ be _resolvedLocaleData_.[[hourCycle12]].
         1. Else if _hour12_ is *false*, then
-          1. Let _hc_ be _dataLocaleData_.[[hourCycle24]].
+          1. Let _hc_ be _resolvedLocaleData_.[[hourCycle24]].
         1. Else,
           1. Assert: _hour12_ is *undefined*.
           1. Let _hc_ be _r_.[[hc]].
-          1. If _hc_ is *null*, set _hc_ to _dataLocaleData_.[[hourCycle]].
+          1. If _hc_ is *null*, set _hc_ to _resolvedLocaleData_.[[hourCycle]].
         1. Set _dateTimeFormat_.[[HourCycle]] to _hc_.
         1. Let _timeZone_ be ? Get(_options_, *"timeZone"*).
         1. If _timeZone_ is *undefined*, then
@@ -139,7 +139,7 @@ <h1>
             1. Throw a *TypeError* exception.
           1. If _required_ is ~time~ and _dateStyle_ is not *undefined*, then
             1. Throw a *TypeError* exception.
-          1. Let _styles_ be _dataLocaleData_.[[styles]].[[&lt;_resolvedCalendar_&gt;]].
+          1. Let _styles_ be _resolvedLocaleData_.[[styles]].[[&lt;_resolvedCalendar_&gt;]].
           1. Let _bestFormat_ be DateTimeStyleFormat(_dateStyle_, _timeStyle_, _styles_).
         1. Else,
           1. Let _needDefaults_ be *true*.
@@ -157,7 +157,7 @@ <h1>
           1. If _needDefaults_ is *true* and _defaults_ is either ~time~ or ~all~, then
             1. For each property name _prop_ of &laquo; *"hour"*, *"minute"*, *"second"* &raquo;, do
               1. Set _formatOptions_.[[&lt;_prop_&gt;]] to *"numeric"*.
-          1. Let _formats_ be _dataLocaleData_.[[formats]].[[&lt;_resolvedCalendar_&gt;]].
+          1. Let _formats_ be _resolvedLocaleData_.[[formats]].[[&lt;_resolvedCalendar_&gt;]].
           1. If _formatMatcher_ is *"basic"*, then
             1. Let _bestFormat_ be BasicFormatMatcher(_formatOptions_, _formats_).
           1. Else,

spec/displaynames.html

@@ -34,9 +34,9 @@ <h1>Intl.DisplayNames ( _locales_, _options_ )</h1>
         1. Let _fallback_ be ? GetOption(_options_, *"fallback"*, ~string~, &laquo; *"code"*, *"none"* &raquo;, *"code"*).
         1. Set _displayNames_.[[Fallback]] to _fallback_.
         1. Set _displayNames_.[[Locale]] to _r_.[[locale]].
-        1. Let _dataLocale_ be GetLocaleBaseName(_r_.[[locale]]).
-        1. Let _dataLocaleData_ be _localeData_.[[&lt;_dataLocale_&gt;]].
-        1. Let _types_ be _dataLocaleData_.[[types]].
+        1. Let _resolvedLocaleBaseName_ be GetLocaleBaseName(_r_.[[locale]]).
+        1. Let _resolvedLocaleData_ be _localeData_.[[&lt;_resolvedLocaleBaseName_&gt;]].
+        1. Let _types_ be _resolvedLocaleData_.[[types]].
         1. Assert: _types_ is a Record (see <emu-xref href="#sec-Intl.DisplayNames-internal-slots"></emu-xref>).
         1. Let _languageDisplay_ be ? GetOption(_options_, *"languageDisplay"*, ~string~, &laquo; *"dialect"*, *"standard"* &raquo;, *"dialect"*).
         1. Let _typeFields_ be _types_.[[&lt;_type_&gt;]].

spec/listformat.html

@@ -30,10 +30,10 @@ <h1>Intl.ListFormat ( [ _locales_ [ , _options_ ] ] )</h1>
         1. Set _listFormat_.[[Type]] to _type_.
         1. Let _style_ be ? GetOption(_options_, *"style"*, ~string~, &laquo; *"long"*, *"short"*, *"narrow"* &raquo;, *"long"*).
         1. Set _listFormat_.[[Style]] to _style_.
-        1. Let _dataLocale_ be GetLocaleBaseName(_r_.[[locale]]).
-        1. Let _dataLocaleData_ be _localeData_.[[&lt;_dataLocale_&gt;]].
-        1. Let _dataLocaleTypes_ be _dataLocaleData_.[[&lt;_type_&gt;]].
-        1. Set _listFormat_.[[Templates]] to _dataLocaleTypes_.[[&lt;_style_&gt;]].
+        1. Let _resolvedLocaleBaseName_ be GetLocaleBaseName(_r_.[[locale]]).
+        1. Let _resolvedLocaleData_ be _localeData_.[[&lt;_resolvedLocaleBaseName_&gt;]].
+        1. Let _resolvedLocaleTypes_ be _resolvedLocaleData_.[[&lt;_type_&gt;]].
+        1. Set _listFormat_.[[Templates]] to _resolvedLocaleTypes_.[[&lt;_style_&gt;]].
         1. Return _listFormat_.
       </emu-alg>
     </emu-clause>

spec/numberformat.html

@@ -1458,9 +1458,9 @@ <h1>
       </dl>
       <emu-alg>
         1. Let _localeData_ be %Intl.NumberFormat%.[[LocaleData]].
-        1. Let _dataLocale_ be GetLocaleBaseName(_numberFormat_.[[Locale]]).
-        1. Let _dataLocaleData_ be _localeData_.[[&lt;_dataLocale_&gt;]].
-        1. Let _patterns_ be _dataLocaleData_.[[patterns]].
+        1. Let _resolvedLocaleBaseName_ be GetLocaleBaseName(_numberFormat_.[[Locale]]).
+        1. Let _resolvedLocaleData_ be _localeData_.[[&lt;_resolvedLocaleBaseName_&gt;]].
+        1. Let _patterns_ be _resolvedLocaleData_.[[patterns]].
         1. Assert: _patterns_ is a Record (see <emu-xref href="#sec-intl.numberformat-internal-slots"></emu-xref>).
         1. Let _style_ be _numberFormat_.[[Style]].
         1. If _style_ is *"percent"*, then
@@ -1547,9 +1547,9 @@ <h1>
       </dl>
       <emu-alg>
         1. Let _localeData_ be %Intl.NumberFormat%.[[LocaleData]].
-        1. Let _dataLocale_ be GetLocaleBaseName(_numberFormat_.[[Locale]]).
-        1. Let _dataLocaleData_ be _localeData_.[[&lt;_dataLocale_&gt;]].
-        1. Let _notationSubPatterns_ be _dataLocaleData_.[[notationSubPatterns]].
+        1. Let _resolvedLocaleBaseName_ be GetLocaleBaseName(_numberFormat_.[[Locale]]).
+        1. Let _resolvedLocaleData_ be _localeData_.[[&lt;_resolvedLocaleBaseName_&gt;]].
+        1. Let _notationSubPatterns_ be _resolvedLocaleData_.[[notationSubPatterns]].
         1. Assert: _notationSubPatterns_ is a Record (see <emu-xref href="#sec-intl.numberformat-internal-slots"></emu-xref>).
         1. Let _notation_ be _numberFormat_.[[Notation]].
         1. If _notation_ is *"scientific"* or _notation_ is *"engineering"*, then

spec/relativetimeformat.html

@@ -308,8 +308,8 @@ <h1>
         1. If _value_ is *NaN*, *+&infin;*<sub>𝔽</sub>, or *-&infin;*<sub>𝔽</sub>, throw a *RangeError* exception.
         1. Let _unit_ be ? SingularRelativeTimeUnit(_unit_).
         1. Let _localeData_ be %Intl.RelativeTimeFormat%.[[LocaleData]].
-        1. Let _dataLocale_ be GetLocaleBaseName(_relativeTimeFormat_.[[Locale]]).
-        1. Let _fields_ be _localeData_.[[&lt;_dataLocale_&gt;]].
+        1. Let _resolvedLocaleBaseName_ be GetLocaleBaseName(_relativeTimeFormat_.[[Locale]]).
+        1. Let _fields_ be _localeData_.[[&lt;_resolvedLocaleBaseName_&gt;]].
         1. Let _style_ be _relativeTimeFormat_.[[Style]].
         1. If _style_ is equal to *"short"*, then
           1. Let _entry_ be the string-concatenation of _unit_ and *"-short"*.