diff options
| author | Timothy Flynn <trflynn89@pm.me> | 2021-12-10 11:44:24 -0500 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2021-12-10 21:27:24 +0000 |
| commit | 76aab821f42d0e660dd0d2c7401d73e7d8479f4e (patch) | |
| tree | 2e1a61fca66797936cfac579a7495dc7b8fe6264 /Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp | |
| parent | 1a5bf15b4da25e4b9362519439ed1bc2b021bc24 (diff) | |
| download | serenity-76aab821f42d0e660dd0d2c7401d73e7d8479f4e.zip | |
LibJS+LibUnicode: Rename some Unicode::DayPeriod values
In the CLDR, there aren't "night" values, there are "night1" & "night2"
values. This is for locales which use a different name for nighttime
depending on the hour. For example, the ja locale uses "ε€" between the
hours of 19:00 and 23:00, and "ε€δΈ" between the hours of 23:00 and
04:00. Our CLDR parser is currently ignoring "night2", so this rename
is to prepare for that.
We could probably come up with better names, but in the end, the API in
LibUnicode will be such that outside callers won't even see Night1, etc.
Diffstat (limited to 'Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp')
| -rw-r--r-- | Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp index 8abf7e1135..4144976733 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp @@ -760,12 +760,12 @@ static Optional<StringView> day_period_for_hour(StringView locale, StringView ca // FIXME: This isn't locale-aware. We should parse the CLDR's cldr-core/supplemental/dayPeriods.json file // to acquire day periods per-locale. For now, these are hard-coded to the en locale's values. if ((hour >= 6) && (hour < 12)) - return Unicode::get_calendar_day_period_symbol(locale, calendar, style, Unicode::DayPeriod::Morning); + return Unicode::get_calendar_day_period_symbol(locale, calendar, style, Unicode::DayPeriod::Morning1); if ((hour >= 12) && (hour < 18)) - return Unicode::get_calendar_day_period_symbol(locale, calendar, style, Unicode::DayPeriod::Afternoon); + return Unicode::get_calendar_day_period_symbol(locale, calendar, style, Unicode::DayPeriod::Afternoon1); if ((hour >= 18) && (hour < 21)) - return Unicode::get_calendar_day_period_symbol(locale, calendar, style, Unicode::DayPeriod::Evening); - return Unicode::get_calendar_day_period_symbol(locale, calendar, style, Unicode::DayPeriod::Night); + return Unicode::get_calendar_day_period_symbol(locale, calendar, style, Unicode::DayPeriod::Evening1); + return Unicode::get_calendar_day_period_symbol(locale, calendar, style, Unicode::DayPeriod::Night1); } // 11.1.7 FormatDateTimePattern ( dateTimeFormat, patternParts, x, rangeFormatOptions ), https://tc39.es/ecma402/#sec-formatdatetimepattern |