From 3f33f6735e48cb7299c75b5c7cdbff5ee807ddb0 Mon Sep 17 00:00:00 2001 From: Andrew Bonventre Date: Wed, 27 Jan 2016 12:59:10 -0500 Subject: [PATCH] Fix bug where 12:NN PM was being displaed as 0:NN PM Change-Id: I941a8146fba3c85610e99bd70cd7a766d59700f2 --- polygerrit-ui/app/elements/gr-date-formatter.html | 8 ++++++-- polygerrit-ui/app/test/gr-date-formatter-test.html | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/polygerrit-ui/app/elements/gr-date-formatter.html b/polygerrit-ui/app/elements/gr-date-formatter.html index 55782f61f7..a13dbb8e5c 100644 --- a/polygerrit-ui/app/elements/gr-date-formatter.html +++ b/polygerrit-ui/app/elements/gr-date-formatter.html @@ -66,8 +66,12 @@ limitations under the License. // Within 24 hours and on the same day: // '2:14 AM' var pm = t.getHours() >= 12; - var hours = t.getHours() === 0 ? 12 : - pm ? t.getHours() - 12 : t.getHours(); + var hours = t.getHours(); + if (hours == 0) { + hours = 12; + } else if (hours > 12) { + hours = t.getHours() - 12; + } var minutes = t.getMinutes() < 10 ? '0' + t.getMinutes() : t.getMinutes(); return hours + ':' + minutes + (pm ? ' PM' : ' AM'); diff --git a/polygerrit-ui/app/test/gr-date-formatter-test.html b/polygerrit-ui/app/test/gr-date-formatter-test.html index 5e73f3bc35..10e8ce887c 100644 --- a/polygerrit-ui/app/test/gr-date-formatter-test.html +++ b/polygerrit-ui/app/test/gr-date-formatter-test.html @@ -61,6 +61,9 @@ limitations under the License. testDates('2015-07-29T20:34:00.000Z', '2015-07-29T15:34:00.000Z', '3:34 PM'); + testDates('2016-01-27T17:41:00.000Z', + '2016-01-27T12:41:00.000Z', + '12:41 PM'); // Within 24 hours on different days. testDates('2015-07-29T03:34:00.000Z',