RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2026-01-12 23:31:01 +00:00
Code Issues Activity Actions

LibJS: Do not override hour, minute, and second format field lengths

Browse source 
This was an oversight in e42d954743.

These fields should always follow the locale preference in the CLDR.
Overriding these fields would permit formats like "h:mm:ss" to result in
strings like "1:2:3" instead of "1:02:03".
This commit is contained in:
Timothy Flynn 2021-12-07 08:45:55 -05:00 • committed by Linus Groh
parent 9f7c727720
commit 26f9666191
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp
View file

@ -666,6 +666,11 @@ Optional<Unicode::CalendarPattern> basic_format_matcher(Unicode::CalendarPattern
best_format_field = option_field;
break;
case Unicode::CalendarPattern::Field::Hour:
case Unicode::CalendarPattern::Field::Minute:
case Unicode::CalendarPattern::Field::Second:
break;
default:
if (best_format_field.has_value() && option_field.has_value())
best_format_field = option_field;

4
Userland/Libraries/LibJS/Tests/builtins/Intl/DateTimeFormat/DateTimeFormat.prototype.resolvedOptions.js
View file

@ -165,14 +165,14 @@ describe("correct behavior", () => {
test("minute", () => {
["2-digit", "numeric"].forEach(minute => {
const en = new Intl.DateTimeFormat("en", { minute: minute });
expect(en.resolvedOptions().minute).toBe(minute);
expect(en.resolvedOptions().minute).toBe("2-digit");
});
});
test("second", () => {
["2-digit", "numeric"].forEach(second => {
const en = new Intl.DateTimeFormat("en", { second: second });
expect(en.resolvedOptions().second).toBe(second);
expect(en.resolvedOptions().second).toBe("2-digit");
});
});