RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:38:10 +00:00
Code Issues Activity Actions

LibUnicode: Fall back to GMT offset when a time zone name is unavailable

Browse source 
The following table in TR-35 includes a web of fall back rules when the
requested time zone style is unavailable:
https://unicode.org/reports/tr35/tr35-dates.html#dfst-zone

Conveniently, the subset of styles supported by ECMA-402 (and therefore
LibUnicode) all either fall back to GMT offset or to a style that is
unsupported but itself falls back to GMT offset.
This commit is contained in:
Timothy Flynn 2022-01-11 12:06:26 -05:00 • committed by Linus Groh
parent 8d35563f28
commit d50f5e14f8
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Libraries/LibUnicode/DateTimeFormat.cpp
View file

@ -262,7 +262,9 @@ String format_time_zone(StringView locale, StringView time_zone, CalendarPattern
case CalendarPatternStyle::Long:
case CalendarPatternStyle::ShortGeneric:
case CalendarPatternStyle::LongGeneric:
return get_time_zone_name(locale, time_zone, style).value_or(time_zone);
if (auto name = get_time_zone_name(locale, time_zone, style); name.has_value())
return *name;
break;
case CalendarPatternStyle::ShortOffset:
case CalendarPatternStyle::LongOffset:
@ -271,6 +273,21 @@ String format_time_zone(StringView locale, StringView time_zone, CalendarPattern
default:
VERIFY_NOT_REACHED();
}
// If more styles are added, consult the following table to ensure always falling back to GMT offset is still correct:
// https://unicode.org/reports/tr35/tr35-dates.html#dfst-zone
switch (style) {
case CalendarPatternStyle::Short:
case CalendarPatternStyle::ShortGeneric:
return format_time_zone(locale, time_zone, CalendarPatternStyle::ShortOffset, time);
case CalendarPatternStyle::Long:
case CalendarPatternStyle::LongGeneric:
return format_time_zone(locale, time_zone, CalendarPatternStyle::LongOffset, time);
default:
VERIFY_NOT_REACHED();
}
}
}