Time Chooser: Fix wrong 24h/12h format conversion

2026-01-14 20:39:20 +01:00
parent 2e545e8439
commit c51a8f037b
1 changed files with 6 additions and 6 deletions
@@ -54,8 +54,8 @@ export class TimeChooser extends Gtk.Widget {

    #convertTimeTo12hFormat(time) {
        const { hours: hours24, minutes } = this.#convertTimeTo24hFormat(time);
-        const hours = hours24 % 12;
-        const isPm = hours24 > 12;
+        const hours = hours24 === 0 ? 12 : hours24 % 12;
+        const isPm = hours24 >= 12;
        return { hours, minutes, isPm };
    }

@@ -64,10 +64,10 @@ export class TimeChooser extends Gtk.Widget {
    }

    #convert12hFormatToTime({ hours, minutes, isPm }) {
-        return this.#convert24hFormatToTime({
-            hours: hours + Number(isPm) * 12,
-            minutes,
-        });
+        let hours24 = hours + Number(isPm) * 12;
+        if (hours === 12)
+            hours24 = isPm ? 12 : 0;
+        return this.#convert24hFormatToTime({ hours: hours24, minutes });
    }

    onTimeChanged(_chooser) {