Merge remote-tracking branch 'origin/develop' into develop

2017-05-26 20:10:47 +00:00 · 2017-05-26 20:10:47 +00:00 · 765034dc19
parent 5f2012102c db3d455a1d
commit 765034dc19
1 changed files with 1 additions and 1 deletions
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@ -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}`;
 }