RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:17:45 +00:00
Code Issues Activity Actions

LibTimeZone: Add methods to canonicalize a time zone name

Browse source
This commit is contained in:
Timothy Flynn 2022-01-10 12:57:30 -05:00 • committed by Linus Groh
parent 1c2c98ac5d
commit e9c42d0bc5
3 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Tests/LibTimeZone/TestTimeZone.cpp
View file

@ -69,4 +69,19 @@ TEST_CASE(time_zone_to_string_link)
EXPECT_EQ(TimeZone::time_zone_to_string(TimeZone::TimeZone::Etc_Universal), "Etc/UTC"sv);
}
TEST_CASE(canonicalize_time_zone)
{
EXPECT_EQ(TimeZone::canonicalize_time_zone("America/New_York"sv), "America/New_York"sv);
EXPECT_EQ(TimeZone::canonicalize_time_zone("AmErIcA/NeW_YoRk"sv), "America/New_York"sv);
EXPECT_EQ(TimeZone::canonicalize_time_zone("UTC"sv), "UTC"sv);
EXPECT_EQ(TimeZone::canonicalize_time_zone("GMT"sv), "UTC"sv);
EXPECT_EQ(TimeZone::canonicalize_time_zone("GMT+0"sv), "UTC"sv);
EXPECT_EQ(TimeZone::canonicalize_time_zone("GMT-0"sv), "UTC"sv);
EXPECT_EQ(TimeZone::canonicalize_time_zone("Etc/UTC"sv), "UTC"sv);
EXPECT_EQ(TimeZone::canonicalize_time_zone("Etc/GMT"sv), "UTC"sv);
EXPECT(!TimeZone::canonicalize_time_zone("I don't exist"sv).has_value());
}
#endif

13
Userland/Libraries/LibTimeZone/TimeZone.cpp
View file

@ -11,4 +11,17 @@ namespace TimeZone {
Optional<TimeZone> __attribute__((weak)) time_zone_from_string(StringView) { return {}; }
StringView __attribute__((weak)) time_zone_to_string(TimeZone) { return {}; }
Optional<StringView> canonicalize_time_zone(StringView time_zone)
{
auto maybe_time_zone = time_zone_from_string(time_zone);
if (!maybe_time_zone.has_value())
return {};
auto canonical_time_zone = time_zone_to_string(*maybe_time_zone);
if (canonical_time_zone.is_one_of("Etc/UTC"sv, "Etc/GMT"sv))
return "UTC"sv;
return canonical_time_zone;
}
}

1
Userland/Libraries/LibTimeZone/TimeZone.h
View file

@ -14,5 +14,6 @@ namespace TimeZone {
Optional<TimeZone> time_zone_from_string(StringView time_zone);
StringView time_zone_to_string(TimeZone time_zone);
Optional<StringView> canonicalize_time_zone(StringView time_zone);
}