From 897c7f7cc285b704e0240d2051a236ecc4e2e326 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Tue, 13 Dec 2022 10:12:48 -0500 Subject: [PATCH] LibJS: Set DateTimeFormat's time zone when the CLDR download is disabled We return early from the DateTimeFormat constructor to avoid crashing on assertions when the CLDR is disabled. However, after commit 019211b, the spec now mandates we assert the time zone identifier is valid. The early return resulted in this identifier being an empty string. --- .../LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp index 5e85043ac8..49baca561b 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormatConstructor.cpp @@ -169,8 +169,10 @@ ThrowCompletionOr initialize_date_time_format(VM& vm, DateTimeF auto default_hour_cycle = ::Locale::get_default_regional_hour_cycle(data_locale); // Non-standard, default_hour_cycle will be empty if Unicode data generation is disabled. - if (!default_hour_cycle.has_value()) + if (!default_hour_cycle.has_value()) { + date_time_format.set_time_zone(default_time_zone()); return &date_time_format; + } Optional<::Locale::HourCycle> hour_cycle_value;