From aa88ea100ed985176e456e60dc36a8cc2179f884 Mon Sep 17 00:00:00 2001 From: Matt Isenhower Date: Tue, 26 Sep 2017 17:15:01 -0700 Subject: [PATCH] Fix some mistakes and display UTC as 24-hour time --- src/js/components/screenshots/Wrapper.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/js/components/screenshots/Wrapper.vue b/src/js/components/screenshots/Wrapper.vue index e4bc480..1f7ecdb 100644 --- a/src/js/components/screenshots/Wrapper.vue +++ b/src/js/components/screenshots/Wrapper.vue @@ -30,14 +30,14 @@
- + - + - +
{{ time | dateTime('en', 'UTC') }}{{ time | dateTime('en', 'UTC', 'MMMM D, YYYY HH:mm z') }}
{{ time | dateTime('en-us', 'America/Los_Angeles', true) }}{{ time | dateTime('en-us', 'America/Los_Angeles') }} {{ time | dateTime('en-gb', 'Europe/London') }}
{{ time | dateTime('en-us', 'America/New_York', true) }}{{ time | dateTime('en-us', 'America/New_York') }} {{ time | dateTime('ja-jp', 'Asia/Tokyo') }}
@@ -56,10 +56,10 @@ import moment from 'moment-timezone'; export default { props: ['title', 'time'], filters: { - dateTime(value, locale, timeZone, hour12 = false) { + dateTime(value, locale, timeZone, format = 'LLL z') { let date = moment.unix(value).tz(timeZone); date.locale(locale) - return date.format('LLL z'); + return date.format(format); }, }, }