Skip to content

Commit 1947af9

Browse files
committed
[multitimer] fix displaying 12h vs 24h
1 parent 9f9fe7c commit 1947af9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

apps/multitimer/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function formatAlarmTime(t) {
3838
// Use locale.time so formatting respects 12h/24h user settings
3939
const d = new Date(1999, 1, 1, dt.hrs, dt.mins, 0);
4040
const timeStr = require("locale").time(d, 1);
41-
const mer = require("locale").meridian(d, 1);
41+
const mer = require("locale").meridian(d);
4242
return timeStr + mer;
4343
}
4444

@@ -657,7 +657,7 @@ function editAlarm(idx, a) {
657657
value: t.hrs, min: 0, max: 23, wrap: true,
658658
format: v => {
659659
// Show 12h or 24h based on locale settings
660-
const mer = require("locale").meridian(new Date(1999,1,1,v,0,0), 1);
660+
const mer = require("locale").meridian(new Date(1999,1,1,v,0,0));
661661
return (!mer) ? v : (v%12||12) + mer;
662662
},
663663
onchange: v => {

0 commit comments

Comments
 (0)