diff options
Diffstat (limited to 'deps/v8/src/objects/js-list-format.cc')
| -rw-r--r-- | deps/v8/src/objects/js-list-format.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/deps/v8/src/objects/js-list-format.cc b/deps/v8/src/objects/js-list-format.cc index e6f9c76a61..dd7ab172af 100644 --- a/deps/v8/src/objects/js-list-format.cc +++ b/deps/v8/src/objects/js-list-format.cc @@ -411,15 +411,11 @@ MaybeHandle<String> JSListFormat::FormatList(Isolate* isolate, return Intl::ToString(isolate, formatted); } -std::set<std::string> JSListFormat::GetAvailableLocales() { - int32_t num_locales = 0; - // TODO(ftang): for now just use - // icu::Locale::getAvailableLocales(count) until we migrate to - // Intl::GetAvailableLocales(). +const std::set<std::string>& JSListFormat::GetAvailableLocales() { + // Since ListFormatter does not have a method to list all supported + // locales, use the one in icu::Locale per comments in // ICU FR at https://unicode-org.atlassian.net/browse/ICU-20015 - const icu::Locale* icu_available_locales = - icu::Locale::getAvailableLocales(num_locales); - return Intl::BuildLocaleSet(icu_available_locales, num_locales); + return Intl::GetAvailableLocalesForLocale(); } // ecma42 #sec-formatlisttoparts |