Time Chooser: Fix wrong 24h/12h format conversion
This commit is contained in:
@@ -54,8 +54,8 @@ export class TimeChooser extends Gtk.Widget {
|
|||||||
|
|
||||||
#convertTimeTo12hFormat(time) {
|
#convertTimeTo12hFormat(time) {
|
||||||
const { hours: hours24, minutes } = this.#convertTimeTo24hFormat(time);
|
const { hours: hours24, minutes } = this.#convertTimeTo24hFormat(time);
|
||||||
const hours = hours24 % 12;
|
const hours = hours24 === 0 ? 12 : hours24 % 12;
|
||||||
const isPm = hours24 > 12;
|
const isPm = hours24 >= 12;
|
||||||
return { hours, minutes, isPm };
|
return { hours, minutes, isPm };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,10 +64,10 @@ export class TimeChooser extends Gtk.Widget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#convert12hFormatToTime({ hours, minutes, isPm }) {
|
#convert12hFormatToTime({ hours, minutes, isPm }) {
|
||||||
return this.#convert24hFormatToTime({
|
let hours24 = hours + Number(isPm) * 12;
|
||||||
hours: hours + Number(isPm) * 12,
|
if (hours === 12)
|
||||||
minutes,
|
hours24 = isPm ? 12 : 0;
|
||||||
});
|
return this.#convert24hFormatToTime({ hours: hours24, minutes });
|
||||||
}
|
}
|
||||||
|
|
||||||
onTimeChanged(_chooser) {
|
onTimeChanged(_chooser) {
|
||||||
|
|||||||
Reference in New Issue
Block a user