diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DurationFormat.h b/Userland/Libraries/LibJS/Runtime/Intl/DurationFormat.h index 8bc45ff592..92f3f52268 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DurationFormat.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/DurationFormat.h @@ -204,10 +204,10 @@ static constexpr AK::Array date_values = { "long"sv, "short"sv, " static constexpr AK::Array time_values = { "long"sv, "short"sv, "narrow"sv, "numeric"sv, "2-digit"sv }; static constexpr AK::Array sub_second_values = { "long"sv, "short"sv, "narrow"sv, "numeric"sv }; static constexpr AK::Array duration_instances_components { - DurationInstanceComponent { &Temporal::DurationRecord::years, &DurationFormat::years_style, &DurationFormat::set_years_style, &DurationFormat::years_display, &DurationFormat::set_years_display, "years"sv, "year"sv, date_values, "narrow"sv }, - DurationInstanceComponent { &Temporal::DurationRecord::months, &DurationFormat::months_style, &DurationFormat::set_months_style, &DurationFormat::months_display, &DurationFormat::set_months_display, "months"sv, "month"sv, date_values, "narrow"sv }, - DurationInstanceComponent { &Temporal::DurationRecord::weeks, &DurationFormat::weeks_style, &DurationFormat::set_weeks_style, &DurationFormat::weeks_display, &DurationFormat::set_weeks_display, "weeks"sv, "week"sv, date_values, "narrow"sv }, - DurationInstanceComponent { &Temporal::DurationRecord::days, &DurationFormat::days_style, &DurationFormat::set_days_style, &DurationFormat::days_display, &DurationFormat::set_days_display, "days"sv, "day"sv, date_values, "narrow"sv }, + DurationInstanceComponent { &Temporal::DurationRecord::years, &DurationFormat::years_style, &DurationFormat::set_years_style, &DurationFormat::years_display, &DurationFormat::set_years_display, "years"sv, "year"sv, date_values, "short"sv }, + DurationInstanceComponent { &Temporal::DurationRecord::months, &DurationFormat::months_style, &DurationFormat::set_months_style, &DurationFormat::months_display, &DurationFormat::set_months_display, "months"sv, "month"sv, date_values, "short"sv }, + DurationInstanceComponent { &Temporal::DurationRecord::weeks, &DurationFormat::weeks_style, &DurationFormat::set_weeks_style, &DurationFormat::weeks_display, &DurationFormat::set_weeks_display, "weeks"sv, "week"sv, date_values, "short"sv }, + DurationInstanceComponent { &Temporal::DurationRecord::days, &DurationFormat::days_style, &DurationFormat::set_days_style, &DurationFormat::days_display, &DurationFormat::set_days_display, "days"sv, "day"sv, date_values, "short"sv }, DurationInstanceComponent { &Temporal::DurationRecord::hours, &DurationFormat::hours_style, &DurationFormat::set_hours_style, &DurationFormat::hours_display, &DurationFormat::set_hours_display, "hours"sv, "hour"sv, time_values, "numeric"sv }, DurationInstanceComponent { &Temporal::DurationRecord::minutes, &DurationFormat::minutes_style, &DurationFormat::set_minutes_style, &DurationFormat::minutes_display, &DurationFormat::set_minutes_display, "minutes"sv, "minute"sv, time_values, "numeric"sv }, DurationInstanceComponent { &Temporal::DurationRecord::seconds, &DurationFormat::seconds_style, &DurationFormat::set_seconds_style, &DurationFormat::seconds_display, &DurationFormat::set_seconds_display, "seconds"sv, "second"sv, time_values, "numeric"sv }, diff --git a/Userland/Libraries/LibJS/Tests/builtins/Intl/DurationFormat/DurationFormat.prototype.format.js b/Userland/Libraries/LibJS/Tests/builtins/Intl/DurationFormat/DurationFormat.prototype.format.js index 00a4b7bd7e..ee24a5e0c9 100644 --- a/Userland/Libraries/LibJS/Tests/builtins/Intl/DurationFormat/DurationFormat.prototype.format.js +++ b/Userland/Libraries/LibJS/Tests/builtins/Intl/DurationFormat/DurationFormat.prototype.format.js @@ -32,7 +32,7 @@ describe("correct behavior", () => { "1y 2m 3w 3d 4h 5m 6s 7ms 8μs 9ns" ); expect(new Intl.DurationFormat("en", { style: "digital" }).format(duration)).toBe( - "1y 2m 3w 3d 4:05:06" + "1 yr 2 mths 3 wks 3 days 4:05:06" ); expect( new Intl.DurationFormat("en", { @@ -52,7 +52,7 @@ describe("correct behavior", () => { "1 J, 2 M, 3 W, 3 T, 4 Std., 5 Min., 6 Sek., 7 ms, 8 μs und 9 ns" ); expect(new Intl.DurationFormat("de", { style: "digital" }).format(duration)).toBe( - "1 J, 2 M, 3 W, 3 T und 4:05:06" + "1 J, 2 Mon., 3 Wo., 3 Tg. und 4:05:06" ); expect( new Intl.DurationFormat("de", { diff --git a/Userland/Libraries/LibJS/Tests/builtins/Intl/DurationFormat/DurationFormat.prototype.formatToParts.js b/Userland/Libraries/LibJS/Tests/builtins/Intl/DurationFormat/DurationFormat.prototype.formatToParts.js index 53cce1a945..6098cb1efa 100644 --- a/Userland/Libraries/LibJS/Tests/builtins/Intl/DurationFormat/DurationFormat.prototype.formatToParts.js +++ b/Userland/Libraries/LibJS/Tests/builtins/Intl/DurationFormat/DurationFormat.prototype.formatToParts.js @@ -123,13 +123,13 @@ describe("correct behavior", () => { ]); expect(new Intl.DurationFormat("en", { style: "digital" }).formatToParts(duration)).toEqual( [ - { type: "element", value: "1y" }, + { type: "element", value: "1 yr" }, { type: "literal", value: " " }, - { type: "element", value: "2m" }, + { type: "element", value: "2 mths" }, { type: "literal", value: " " }, - { type: "element", value: "3w" }, + { type: "element", value: "3 wks" }, { type: "literal", value: " " }, - { type: "element", value: "3d" }, + { type: "element", value: "3 days" }, { type: "literal", value: " " }, { type: "element", value: "4:05:06" }, ] @@ -227,11 +227,11 @@ describe("correct behavior", () => { [ { type: "element", value: "1 J" }, { type: "literal", value: ", " }, - { type: "element", value: "2 M" }, + { type: "element", value: "2 Mon." }, { type: "literal", value: ", " }, - { type: "element", value: "3 W" }, + { type: "element", value: "3 Wo." }, { type: "literal", value: ", " }, - { type: "element", value: "3 T" }, + { type: "element", value: "3 Tg." }, { type: "literal", value: " und " }, { type: "element", value: "4:05:06" }, ]