Kiosk: show all user-visible times as 12-hour AM/PM

Add datetime::formatHm12h/formatTime12h and use them for the Home footer
clock, the Timezone page's local-time sample, and the log viewer
timestamps. Storage and parsing remain 24-hour HH:MM. Extends the
date-format tests with the midnight/noon edge cases.
This commit is contained in:
NeilClack
2026-09-29 08:43:59 -05:00
parent 336f47c6ac
commit 59b499037b
6 changed files with 113 additions and 3 deletions
+56
View File
@@ -59,3 +59,59 @@ TEST_F(DateFormatTest, OptionsIncludeDefault) {
EXPECT_EQ(options[0].pattern, std::string(DEFAULT_DATE_FORMAT));
EXPECT_EQ(options[0].name, "Month/Day/Year");
}
TEST_F(DateFormatTest, Converts24HourTo12HourLabels) {
EXPECT_EQ(formatHm12h("00:00"), "12:00 AM");
EXPECT_EQ(formatHm12h("00:05"), "12:05 AM");
EXPECT_EQ(formatHm12h("11:59"), "11:59 AM");
EXPECT_EQ(formatHm12h("12:00"), "12:00 PM");
EXPECT_EQ(formatHm12h("12:30"), "12:30 PM");
EXPECT_EQ(formatHm12h("13:00"), "1:00 PM");
EXPECT_EQ(formatHm12h("23:59"), "11:59 PM");
}
TEST_F(DateFormatTest, LeavesMalformedInputUnchanged) {
EXPECT_EQ(formatHm12h(""), "");
EXPECT_EQ(formatHm12h("7:05"), "7:05");
EXPECT_EQ(formatHm12h("24:00"), "24:00");
EXPECT_EQ(formatHm12h("12:60"), "12:60");
EXPECT_EQ(formatHm12h("ab:cd"), "ab:cd");
}
TEST_F(DateFormatTest, Formats12HourClock) {
std::tm morning = {};
morning.tm_year = 2026 - 1900;
morning.tm_mon = 8 - 1;
morning.tm_mday = 4;
morning.tm_hour = 7;
morning.tm_min = 5;
morning.tm_sec = 0;
morning.tm_isdst = -1;
time_t tMorning = mktime(&morning);
ASSERT_NE(tMorning, static_cast<time_t>(-1));
EXPECT_EQ(formatTime12h(tMorning), "7:05 AM");
std::tm midnight = {};
midnight.tm_year = 2026 - 1900;
midnight.tm_mon = 8 - 1;
midnight.tm_mday = 4;
midnight.tm_hour = 0;
midnight.tm_min = 0;
midnight.tm_sec = 0;
midnight.tm_isdst = -1;
time_t tMidnight = mktime(&midnight);
ASSERT_NE(tMidnight, static_cast<time_t>(-1));
EXPECT_EQ(formatTime12h(tMidnight), "12:00 AM");
std::tm evening = {};
evening.tm_year = 2026 - 1900;
evening.tm_mon = 8 - 1;
evening.tm_mday = 4;
evening.tm_hour = 19;
evening.tm_min = 5;
evening.tm_sec = 0;
evening.tm_isdst = -1;
time_t tEvening = mktime(&evening);
ASSERT_NE(tEvening, static_cast<time_t>(-1));
EXPECT_EQ(formatTime12h(tEvening), "7:05 PM");
}