From 041d946b584e8ca367b00824e0b6f149cae51b46 Mon Sep 17 00:00:00 2001 From: Psychotoxical Date: Wed, 8 Apr 2026 15:23:46 +0200 Subject: [PATCH] feat(settings): 12-hour AM/PM time format for English locale in theme scheduler Co-Authored-By: Claude Sonnet 4.6 --- src/pages/Settings.tsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx index 002b6850..3c6377fb 100644 --- a/src/pages/Settings.tsx +++ b/src/pages/Settings.tsx @@ -1240,10 +1240,14 @@ export default function Settings() { const themeOptions = THEME_GROUPS.flatMap(g => g.themes.map(th => ({ value: th.id, label: th.label, group: g.group })) ); - const hourOptions = Array.from({ length: 24 }, (_, i) => ({ - value: String(i).padStart(2, '0'), - label: String(i).padStart(2, '0'), - })); + const use12h = i18n.language === 'en'; + const hourOptions = Array.from({ length: 24 }, (_, i) => { + const value = String(i).padStart(2, '0'); + const label = use12h + ? `${i % 12 === 0 ? 12 : i % 12} ${i < 12 ? 'AM' : 'PM'}` + : value; + return { value, label }; + }); const minuteOptions = ['00', '05', '10', '15', '20', '25', '30', '35', '40', '45', '50', '55'].map(m => ({ value: m, label: m })); const dayH = theme.timeDayStart.split(':')[0]; const dayM = theme.timeDayStart.split(':')[1];