Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
765034dc19
1 changed files with 1 additions and 1 deletions
|
@ -54,7 +54,7 @@ function pad(n) {
|
|||
function twelveHourTime(date) {
|
||||
let hours = date.getHours() % 12;
|
||||
const minutes = pad(date.getMinutes());
|
||||
const ampm = hours >= 12 ? 'PM' : 'AM';
|
||||
const ampm = date.getHours() >= 12 ? 'PM' : 'AM';
|
||||
hours = pad(hours ? hours : 12);
|
||||
return `${hours}:${minutes} ${ampm}`;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue