From 5d96783f8d5cac8016fccb7609a97f95acd199db Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Mon, 30 Nov 2020 09:51:11 +0530 Subject: [PATCH 1/8] Added date formats --- app/helpers/general-date.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js index 8267fc3eae4..2d83e40ca53 100644 --- a/app/helpers/general-date.js +++ b/app/helpers/general-date.js @@ -1,6 +1,14 @@ import Helper from '@ember/component/helper'; import moment from 'moment'; +const dateFormats = { + 'date-time-long' : 'dddd, D MMMM, YYYY h:mm A', + 'date-time-tz-long' : 'dddd, D MMMM, YYYY h:mm A (z)', + 'date-time-short' : 'D MMM, YYYY h:mm A', + 'date-time-tz-short' : 'D MMM, YYYY h:mm A (z)', + 'date-short' : 'D MMM, YYYY' +}; + export function generalDate(params) { const timezone = params[1] || moment.tz.guess(); const format = params[2] || 'h:mm A, MMMM Do YYYY (z)'; From 5eda4c45928ad1945a9f78e9f88fd0dd0f340ac6 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Mon, 30 Nov 2020 10:13:48 +0530 Subject: [PATCH 2/8] Added date formats-1 --- app/components/public/add-to-calender.hbs | 2 +- app/components/public/session-item.hbs | 2 +- app/helpers/general-date.js | 5 ++--- app/templates/admin/sales/revenue.hbs | 2 +- app/templates/components/event-invoice/event-info.hbs | 4 ++-- app/templates/components/event-invoice/invoice-summary.hbs | 4 ++-- app/templates/components/order-card.hbs | 4 ++-- app/templates/components/orders/event-info.hbs | 4 ++-- app/templates/components/public/call-for-speakers.hbs | 6 +++--- app/templates/components/public/ticket-list.hbs | 2 +- app/templates/components/session-card.hbs | 2 +- app/templates/components/ui-table/cell/cell-event-date.hbs | 4 ++-- app/templates/components/ui-table/cell/cell-simple-date.hbs | 4 ++-- app/templates/components/ui-table/cell/cell-validity.hbs | 4 ++-- .../cell/events/view/tickets/attendees/cell-date.hbs | 4 ++-- .../cell/events/view/tickets/attendees/cell-order.hbs | 4 ++-- .../events/view/tickets/discount-codes/cell-validity.hbs | 2 +- .../ui-table/cell/events/view/tickets/orders/cell-date.hbs | 4 ++-- .../ui-table/cell/events/view/tickets/orders/cell-order.hbs | 4 ++-- app/templates/event-invoice/review.hbs | 4 ++-- app/templates/explore.hbs | 4 ++-- app/templates/orders/expired.hbs | 2 +- app/templates/orders/new.hbs | 2 +- app/templates/orders/pending.hbs | 2 +- app/templates/orders/view.hbs | 2 +- app/templates/public.hbs | 4 ++-- app/templates/public/sessions.hbs | 2 +- 27 files changed, 44 insertions(+), 45 deletions(-) diff --git a/app/components/public/add-to-calender.hbs b/app/components/public/add-to-calender.hbs index 7ad8cacbe3f..04fef83969f 100644 --- a/app/components/public/add-to-calender.hbs +++ b/app/components/public/add-to-calender.hbs @@ -5,7 +5,7 @@ {{#if this.isSingleDay}} {{general-date @event.startsAt "dddd, D MMMM, YYYY" tz=@event.timezone}}
{{general-date @event.startsAt "h:mm A" tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt "h:mm A" tz=@event.timezone}} {{else}} - {{general-date @event.startsAt "dddd, D MMMM, YYYY h:mm A" tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt "dddd, D MMMM, YYYY h:mm A" tz=@event.timezone}} + {{general-date @event.startsAt ft='date-time-long' tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt ft='date-time-long' tz=@event.timezone}} {{/if}} ({{this.timezone}})
diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs index bd39feab0ef..f9cf9e2a725 100644 --- a/app/components/public/session-item.hbs +++ b/app/components/public/session-item.hbs @@ -49,7 +49,7 @@
{{#if @session.startsAt}}
{{@session.microlocation.name}}
-
{{general-date @session.startsAt 'D MMM, YYYY h:mm A (z)' tz=@timezone}}
+
{{general-date @session.startsAt ft='date-time-tz-short' tz=@timezone}}
{{/if}}
{{/if}} diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js index 2c6eb41c90e..6990ffa3090 100644 --- a/app/helpers/general-date.js +++ b/app/helpers/general-date.js @@ -11,19 +11,18 @@ const dateFormats = { const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']); -export function generalDate(params, { tz }) { +export function generalDate(params, { ft, tz }) { const timezone = tz || moment.tz.guess(); const local = moment(params[0]).tz(timezone).locale(); - let format = params[1] || 'h:mm A, MMMM Do YYYY (z)'; + let format = (params[1] || dateFormats[ft]) || 'h:mm A, MMMM Do YYYY (z)'; if (!locales12Hours.has(local)) { format = format.replaceAll('h', 'H'); format = format.replace(' A', ''); format = format.replace(' a', ''); } - return moment(params[0]).tz(timezone).format(format); } diff --git a/app/templates/admin/sales/revenue.hbs b/app/templates/admin/sales/revenue.hbs index ccc5e391828..1d85ef8263e 100644 --- a/app/templates/admin/sales/revenue.hbs +++ b/app/templates/admin/sales/revenue.hbs @@ -38,7 +38,7 @@ {{order.name}} - {{general-date order.eventDate 'D MMM, YYYY'}} + {{general-date order.eventDate ft='date-short'}} {{order.ticketCount}} diff --git a/app/templates/components/event-invoice/event-info.hbs b/app/templates/components/event-invoice/event-info.hbs index 1b1b0281404..4f456588951 100644 --- a/app/templates/components/event-invoice/event-info.hbs +++ b/app/templates/components/event-invoice/event-info.hbs @@ -12,9 +12,9 @@
{{t 'At'}} {{this.event.locationName}}
- {{t 'From'}}: {{general-date this.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} + {{t 'From'}}: {{general-date this.event.startsAt ft='date-time-long'}}
- {{t 'To'}}: {{general-date this.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}} + {{t 'To'}}: {{general-date this.event.endsAt ft='date-time-long'}} {{#if this.event.ownerName}}
{{t 'Organized By'}}: {{this.event.ownerName}} diff --git a/app/templates/components/event-invoice/invoice-summary.hbs b/app/templates/components/event-invoice/invoice-summary.hbs index 3e7c7cb7dcb..e6c1066fdd8 100644 --- a/app/templates/components/event-invoice/invoice-summary.hbs +++ b/app/templates/components/event-invoice/invoice-summary.hbs @@ -26,8 +26,8 @@ {{this.event.name}} - {{general-date this.data.issuedAt 'D MMM, YYYY'}} - {{general-date this.data.completedAt 'D MMM, YYYY'}} + {{general-date this.data.issuedAt ft='date-short'}} + {{general-date this.data.completedAt ft='date-short'}} {{currency-symbol this.eventCurrency}} {{format-money this.data.amount}} diff --git a/app/templates/components/order-card.hbs b/app/templates/components/order-card.hbs index 6a8e3afa033..f14509080fa 100644 --- a/app/templates/components/order-card.hbs +++ b/app/templates/components/order-card.hbs @@ -27,7 +27,7 @@
- {{general-date this.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.order.event.timezone}} + {{general-date this.order.event.startsAt ft='date-time-tz-long' tz=this.order.event.timezone}}
@@ -46,7 +46,7 @@ #{{this.order.identifier}} {{#if this.order.completedAt}} - {{t 'on'}} {{general-date this.order.completedAt 'D MMM, YYYY h:mm A'}} + {{t 'on'}} {{general-date this.order.completedAt ft='date-time-short'}} {{/if}}
diff --git a/app/templates/components/orders/event-info.hbs b/app/templates/components/orders/event-info.hbs index 51d99aa933f..3b992f7861a 100644 --- a/app/templates/components/orders/event-info.hbs +++ b/app/templates/components/orders/event-info.hbs @@ -24,9 +24,9 @@ {{t 'Location or online event details to be announced'}} {{/if}}
- {{t 'From'}}: {{general-date this.data.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} + {{t 'From'}}: {{general-date this.data.event.startsAt ft='date-time-long'}}
- {{t 'To'}}: {{general-date this.data.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}} + {{t 'To'}}: {{general-date this.data.event.endsAt ft='date-time-long'}} {{#if this.data.event.ownerName}}
{{t 'Organized By'}}: {{this.data.event.ownerName}} diff --git a/app/templates/components/public/call-for-speakers.hbs b/app/templates/components/public/call-for-speakers.hbs index 75e5c5d7d7c..cc2df29f1a4 100644 --- a/app/templates/components/public/call-for-speakers.hbs +++ b/app/templates/components/public/call-for-speakers.hbs @@ -4,15 +4,15 @@ {{#if this.data.speakersCall.isOpen}} {{t 'Open'}}
- {{t 'Call for Speakers is open until'}} {{general-date this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.data.speakersCall.event.timezone}} + {{t 'Call for Speakers is open until'}} {{general-date this.data.speakersCall.endsAt ft='date-time-tz-long' tz=this.data.speakersCall.event.timezone}}
{{else}} {{t 'Closed'}}
{{#if this.data.speakersCall.isInFuture}} - {{t 'Call for Speakers will open at'}} {{general-date this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.data.speakersCall.event.timezone}} + {{t 'Call for Speakers will open at'}} {{general-date this.data.speakersCall.endsAt ft='date-time-tz-long' tz=this.data.speakersCall.event.timezone}} {{else}} - {{t 'Call for Speakers was closed at'}} {{general-date this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.data.speakersCall.event.timezone}} + {{t 'Call for Speakers was closed at'}} {{general-date this.data.speakersCall.endsAt ft='date-time-tz-long' tz=this.data.speakersCall.event.timezone}} {{/if}}
{{/if}} diff --git a/app/templates/components/public/ticket-list.hbs b/app/templates/components/public/ticket-list.hbs index b982811057b..7919cf6a708 100644 --- a/app/templates/components/public/ticket-list.hbs +++ b/app/templates/components/public/ticket-list.hbs @@ -28,7 +28,7 @@ {{ticket.description}} {{/if}}
- Sale ends on {{general-date ticket.salesEndsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=@event.timezone}} + Sale ends on {{general-date ticket.salesEndsAt ft='date-time-tz-long' tz=@event.timezone}}
diff --git a/app/templates/components/session-card.hbs b/app/templates/components/session-card.hbs index 8494bdae418..cb67a4ed2bd 100644 --- a/app/templates/components/session-card.hbs +++ b/app/templates/components/session-card.hbs @@ -20,7 +20,7 @@
{{#if this.session.startsAt}} - {{general-date this.session.startsAt 'D MMM, YYYY h:mm A'}} + {{general-date this.session.startsAt ft='date-time-short'}} {{else}} {{t 'Session Not Yet Scheduled'}} {{/if}} diff --git a/app/templates/components/ui-table/cell/cell-event-date.hbs b/app/templates/components/ui-table/cell/cell-event-date.hbs index c61779a3115..39d2878129d 100644 --- a/app/templates/components/ui-table/cell/cell-event-date.hbs +++ b/app/templates/components/ui-table/cell/cell-event-date.hbs @@ -1,11 +1,11 @@ {{#if this.record}} {{#if this.extraRecords.endsAt}}
- {{general-date this.record "D MMM, YYYY h:mm A (z)" tz=this.extraRecords.timezone}} + {{general-date this.record ft='date-time-tz-short' tz=this.extraRecords.timezone}}
(to)
- {{general-date this.record "D MMM, YYYY h:mm A (z)" tz=this.extraRecords.timezone}} + {{general-date this.record ft='date-time-tz-short' tz=this.extraRecords.timezone}}
{{else}} diff --git a/app/templates/components/ui-table/cell/cell-simple-date.hbs b/app/templates/components/ui-table/cell/cell-simple-date.hbs index e4a3e944ca4..2eb3ce9369a 100644 --- a/app/templates/components/ui-table/cell/cell-simple-date.hbs +++ b/app/templates/components/ui-table/cell/cell-simple-date.hbs @@ -1,9 +1,9 @@ {{#if this.extraRecords.timezone}} - {{general-date this.record "D MMM, YYYY h:mm A (z)" tz=this.extraRecords.timezone}} + {{general-date this.record ft='date-time-tz-short' tz=this.extraRecords.timezone}} {{else if this.record}} - {{general-date this.record (if this.props.options.dateFormat this.props.options.dateFormat "D MMM, YYYY h:mm A")}} + {{general-date this.record (if this.props.options.dateFormat this.props.options.dateFormat ft='date-time-short')}} {{/if}} diff --git a/app/templates/components/ui-table/cell/cell-validity.hbs b/app/templates/components/ui-table/cell/cell-validity.hbs index 3aeb33e79a3..9ed7f588054 100644 --- a/app/templates/components/ui-table/cell/cell-validity.hbs +++ b/app/templates/components/ui-table/cell/cell-validity.hbs @@ -1,5 +1,5 @@ - {{general-date this.record 'D MMM, YYYY h:mm A'}} + {{general-date this.record ft='date-time-short'}}
To
- {{general-date this.extraRecords.validTill 'D MMM, YYYY h:mm A'}} + {{general-date this.extraRecords.validTill ft='date-time-short'}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs index c68787e03ad..c8bb5943469 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs @@ -1,5 +1,5 @@ {{#if (eq @record.status 'completed')}} - {{general-date @record.completedAt "D MMM, YYYY h:mm A"}} + {{general-date @record.completedAt ft='date-time-short'}} {{else}} - {{general-date @record.createdAt "D MMM, YYYY h:mm A"}} + {{general-date @record.createdAt ft='date-time-short'}} {{/if}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs index b972e59575a..2a695275cf0 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs @@ -10,10 +10,10 @@ {{/if}} {{#if (eq this.record.status 'completed')}} - {{general-date this.record.completedAt 'D MMM, YYYY h:mm A'}} + {{general-date this.record.completedAt ft='date-time-short'}} {{moment-from-now this.record.completedAt}} {{else}} - {{general-date this.record.createdAt 'D MMM, YYYY h:mm A'}} + {{general-date this.record.createdAt ft='date-time-short'}} {{moment-from-now this.record.createdAt}} {{/if}}
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs index 6fde70bd393..3c0e82f3f1e 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs @@ -1,3 +1,3 @@ - {{general-date this.record 'D MMM, YYYY h:mm A'}} + {{general-date this.record ft='date-time-short'}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs index e3b6b7bf56e..adbc6166b93 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs @@ -1,9 +1,9 @@ {{#if this.record}}
- {{general-date this.record 'D MMM, YYYY h:mm A'}} + {{general-date this.record ft='date-time-short'}}
{{else}}
- {{general-date this.extraRecords.createdAt 'D MMM, YYYY h:mm A'}} + {{general-date this.extraRecords.createdAt ft='date-time-short'}}
{{/if}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs index 9a06c532675..2df8912305a 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs @@ -13,9 +13,9 @@ {{/if}} {{#if this.extraRecords.completedAt}} - {{general-date this.extraRecords.completedAt 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.completedAt}} + {{general-date this.extraRecords.completedAt ft='date-time-short'}} {{moment-from-now this.extraRecords.completedAt}} {{else}} - {{general-date this.extraRecords.createdAt 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.createdAt}} + {{general-date this.extraRecords.createdAt ft='date-time-short'}} {{moment-from-now this.extraRecords.createdAt}} {{/if}} diff --git a/app/templates/event-invoice/review.hbs b/app/templates/event-invoice/review.hbs index 6df92d364d2..5dc8cf5536f 100644 --- a/app/templates/event-invoice/review.hbs +++ b/app/templates/event-invoice/review.hbs @@ -15,10 +15,10 @@ {{t 'Event Name'}}: {{this.model.event.name}}
- {{t 'Date Issued'}}: {{general-date this.model.issuedAt 'UTC' 'D MMM, YYYY'}} + {{t 'Date Issued'}}: {{general-date this.model.issuedAt ft='date-short' tz='UTC'}}
- {{t 'Due Date'}}: {{general-date this.model.dueAt 'UTC' 'D MMM, YYYY'}} + {{t 'Due Date'}}: {{general-date this.model.dueAt ft='date-short' tz='UTC'}}
{{t 'Total Invoice Amount'}}: {{currency-symbol this.model.event.paymentCurrency}} {{format-money this.model.amount}} diff --git a/app/templates/explore.hbs b/app/templates/explore.hbs index 881953be818..7ba1e962178 100644 --- a/app/templates/explore.hbs +++ b/app/templates/explore.hbs @@ -25,13 +25,13 @@ {{/if}} {{#if this.filters.start_date}}
- {{general-date this.filters.start_date 'D MMM, YYYY'}} + {{general-date this.filters.start_date ft='date-short'}}
{{/if}} {{#if this.filters.end_date}}
- {{general-date this.filters.end_date 'D MMM, YYYY'}} + {{general-date this.filters.end_date ft='date-short'}}
{{/if}} diff --git a/app/templates/orders/expired.hbs b/app/templates/orders/expired.hbs index 173f6864c89..1bbf1dfc5b9 100644 --- a/app/templates/orders/expired.hbs +++ b/app/templates/orders/expired.hbs @@ -7,7 +7,7 @@
- {{general-date this.model.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}} + {{general-date this.model.event.startsAt ft='date-time-long'}} - {{general-date this.model.event.endsAt ft='date-time-long'}}
{{this.model.event.locationName}}
diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs index 420cd9f21a8..f8fee080df0 100644 --- a/app/templates/orders/new.hbs +++ b/app/templates/orders/new.hbs @@ -8,7 +8,7 @@
- {{general-date this.model.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}} + {{general-date this.model.order.event.startsAt ft='date-time-long'}} - {{general-date this.model.order.event.endsAt ft='date-time-long'}}
{{this.model.order.event.locationName}}
diff --git a/app/templates/orders/pending.hbs b/app/templates/orders/pending.hbs index 25998f5cb7d..28f312debcb 100644 --- a/app/templates/orders/pending.hbs +++ b/app/templates/orders/pending.hbs @@ -8,7 +8,7 @@
- {{general-date this.model.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}} + {{general-date this.model.order.event.startsAt ft='date-time-long'}} - {{general-date this.model.order.event.endsAt ft='date-time-long'}}
{{this.model.order.event.locationName}}
diff --git a/app/templates/orders/view.hbs b/app/templates/orders/view.hbs index 6507fb0e41e..42c6913aa88 100644 --- a/app/templates/orders/view.hbs +++ b/app/templates/orders/view.hbs @@ -7,7 +7,7 @@
- {{general-date this.model.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}} + {{general-date this.model.order.event.startsAt ft='date-time-long'}} - {{general-date this.model.order.event.endsAt ft='date-time-long'}}
{{this.model.order.event.locationName}}
diff --git a/app/templates/public.hbs b/app/templates/public.hbs index de27ac390af..72624cf2cdc 100644 --- a/app/templates/public.hbs +++ b/app/templates/public.hbs @@ -9,9 +9,9 @@ {{/if}}
-

{{general-date this.model.startsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.model.timezone}}

+

{{general-date this.model.startsAt ft='date-time-tz-long' tz=this.model.timezone}}

{{#if this.displayEndDate}} -
{{t 'To'}} {{general-date this.model.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.model.timezone}}
+
{{t 'To'}} {{general-date this.model.endsAt ft='date-time-tz-long' tz=this.model.timezone}}
{{/if}}

{{this.model.name}}

{{this.headerLocation}}

diff --git a/app/templates/public/sessions.hbs b/app/templates/public/sessions.hbs index a3f982a148c..e1c4c542a56 100644 --- a/app/templates/public/sessions.hbs +++ b/app/templates/public/sessions.hbs @@ -3,7 +3,7 @@
{{t 'All'}} {{#each this.allDates as |date|}} - {{general-date date 'D MMM, YYYY'}} + {{general-date date ft='date-short'}} {{/each}} Date: Mon, 30 Nov 2020 13:22:43 +0530 Subject: [PATCH 3/8] Reverted key argument --- app/components/public/add-to-calender.hbs | 2 +- app/components/public/session-item.hbs | 2 +- app/helpers/general-date.js | 4 ++-- app/templates/admin/sales/revenue.hbs | 2 +- app/templates/components/event-invoice/event-info.hbs | 4 ++-- app/templates/components/event-invoice/invoice-summary.hbs | 4 ++-- app/templates/components/order-card.hbs | 4 ++-- app/templates/components/orders/event-info.hbs | 4 ++-- app/templates/components/public/call-for-speakers.hbs | 6 +++--- app/templates/components/public/ticket-list.hbs | 2 +- app/templates/components/session-card.hbs | 2 +- app/templates/components/ui-table/cell/cell-event-date.hbs | 4 ++-- app/templates/components/ui-table/cell/cell-simple-date.hbs | 4 ++-- app/templates/components/ui-table/cell/cell-validity.hbs | 4 ++-- .../cell/events/view/tickets/attendees/cell-date.hbs | 4 ++-- .../cell/events/view/tickets/attendees/cell-order.hbs | 4 ++-- .../events/view/tickets/discount-codes/cell-validity.hbs | 2 +- .../ui-table/cell/events/view/tickets/orders/cell-date.hbs | 4 ++-- .../ui-table/cell/events/view/tickets/orders/cell-order.hbs | 4 ++-- app/templates/event-invoice/review.hbs | 4 ++-- app/templates/explore.hbs | 4 ++-- app/templates/orders/expired.hbs | 2 +- app/templates/orders/new.hbs | 2 +- app/templates/orders/pending.hbs | 2 +- app/templates/orders/view.hbs | 2 +- app/templates/public.hbs | 4 ++-- app/templates/public/sessions.hbs | 2 +- 27 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/components/public/add-to-calender.hbs b/app/components/public/add-to-calender.hbs index 04fef83969f..7c771f09d6c 100644 --- a/app/components/public/add-to-calender.hbs +++ b/app/components/public/add-to-calender.hbs @@ -5,7 +5,7 @@ {{#if this.isSingleDay}} {{general-date @event.startsAt "dddd, D MMMM, YYYY" tz=@event.timezone}}
{{general-date @event.startsAt "h:mm A" tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt "h:mm A" tz=@event.timezone}} {{else}} - {{general-date @event.startsAt ft='date-time-long' tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt ft='date-time-long' tz=@event.timezone}} + {{general-date @event.startsAt 'date-time-long' tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt 'date-time-long' tz=@event.timezone}} {{/if}} ({{this.timezone}})
diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs index f9cf9e2a725..0ee8749ddcd 100644 --- a/app/components/public/session-item.hbs +++ b/app/components/public/session-item.hbs @@ -49,7 +49,7 @@
{{#if @session.startsAt}}
{{@session.microlocation.name}}
-
{{general-date @session.startsAt ft='date-time-tz-short' tz=@timezone}}
+
{{general-date @session.startsAt 'date-time-tz-short' tz=@timezone}}
{{/if}}
{{/if}} diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js index 6990ffa3090..18410b7989c 100644 --- a/app/helpers/general-date.js +++ b/app/helpers/general-date.js @@ -11,12 +11,12 @@ const dateFormats = { const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']); -export function generalDate(params, { ft, tz }) { +export function generalDate(params, { tz }) { const timezone = tz || moment.tz.guess(); const local = moment(params[0]).tz(timezone).locale(); - let format = (params[1] || dateFormats[ft]) || 'h:mm A, MMMM Do YYYY (z)'; + let format = (dateFormats[params[1]] || params[1]) || 'h:mm A, MMMM Do YYYY (z)'; if (!locales12Hours.has(local)) { format = format.replaceAll('h', 'H'); diff --git a/app/templates/admin/sales/revenue.hbs b/app/templates/admin/sales/revenue.hbs index 1d85ef8263e..e622496a988 100644 --- a/app/templates/admin/sales/revenue.hbs +++ b/app/templates/admin/sales/revenue.hbs @@ -38,7 +38,7 @@ {{order.name}} - {{general-date order.eventDate ft='date-short'}} + {{general-date order.eventDate 'date-short'}} {{order.ticketCount}} diff --git a/app/templates/components/event-invoice/event-info.hbs b/app/templates/components/event-invoice/event-info.hbs index 4f456588951..8d6fd76e834 100644 --- a/app/templates/components/event-invoice/event-info.hbs +++ b/app/templates/components/event-invoice/event-info.hbs @@ -12,9 +12,9 @@
{{t 'At'}} {{this.event.locationName}}
- {{t 'From'}}: {{general-date this.event.startsAt ft='date-time-long'}} + {{t 'From'}}: {{general-date this.event.startsAt 'date-time-long'}}
- {{t 'To'}}: {{general-date this.event.endsAt ft='date-time-long'}} + {{t 'To'}}: {{general-date this.event.endsAt 'date-time-long'}} {{#if this.event.ownerName}}
{{t 'Organized By'}}: {{this.event.ownerName}} diff --git a/app/templates/components/event-invoice/invoice-summary.hbs b/app/templates/components/event-invoice/invoice-summary.hbs index e6c1066fdd8..ba514ae0757 100644 --- a/app/templates/components/event-invoice/invoice-summary.hbs +++ b/app/templates/components/event-invoice/invoice-summary.hbs @@ -26,8 +26,8 @@ {{this.event.name}} - {{general-date this.data.issuedAt ft='date-short'}} - {{general-date this.data.completedAt ft='date-short'}} + {{general-date this.data.issuedAt 'date-short'}} + {{general-date this.data.completedAt 'date-short'}} {{currency-symbol this.eventCurrency}} {{format-money this.data.amount}} diff --git a/app/templates/components/order-card.hbs b/app/templates/components/order-card.hbs index f14509080fa..022712ce256 100644 --- a/app/templates/components/order-card.hbs +++ b/app/templates/components/order-card.hbs @@ -27,7 +27,7 @@
- {{general-date this.order.event.startsAt ft='date-time-tz-long' tz=this.order.event.timezone}} + {{general-date this.order.event.startsAt 'date-time-tz-long' tz=this.order.event.timezone}}
@@ -46,7 +46,7 @@ #{{this.order.identifier}} {{#if this.order.completedAt}} - {{t 'on'}} {{general-date this.order.completedAt ft='date-time-short'}} + {{t 'on'}} {{general-date this.order.completedAt 'date-time-short'}} {{/if}}
diff --git a/app/templates/components/orders/event-info.hbs b/app/templates/components/orders/event-info.hbs index 3b992f7861a..48889c4ee87 100644 --- a/app/templates/components/orders/event-info.hbs +++ b/app/templates/components/orders/event-info.hbs @@ -24,9 +24,9 @@ {{t 'Location or online event details to be announced'}} {{/if}}
- {{t 'From'}}: {{general-date this.data.event.startsAt ft='date-time-long'}} + {{t 'From'}}: {{general-date this.data.event.startsAt 'date-time-long'}}
- {{t 'To'}}: {{general-date this.data.event.endsAt ft='date-time-long'}} + {{t 'To'}}: {{general-date this.data.event.endsAt 'date-time-long'}} {{#if this.data.event.ownerName}}
{{t 'Organized By'}}: {{this.data.event.ownerName}} diff --git a/app/templates/components/public/call-for-speakers.hbs b/app/templates/components/public/call-for-speakers.hbs index cc2df29f1a4..f05ffa03d9f 100644 --- a/app/templates/components/public/call-for-speakers.hbs +++ b/app/templates/components/public/call-for-speakers.hbs @@ -4,15 +4,15 @@ {{#if this.data.speakersCall.isOpen}} {{t 'Open'}}
- {{t 'Call for Speakers is open until'}} {{general-date this.data.speakersCall.endsAt ft='date-time-tz-long' tz=this.data.speakersCall.event.timezone}} + {{t 'Call for Speakers is open until'}} {{general-date this.data.speakersCall.endsAt 'date-time-tz-long' tz=this.data.speakersCall.event.timezone}}
{{else}} {{t 'Closed'}}
{{#if this.data.speakersCall.isInFuture}} - {{t 'Call for Speakers will open at'}} {{general-date this.data.speakersCall.endsAt ft='date-time-tz-long' tz=this.data.speakersCall.event.timezone}} + {{t 'Call for Speakers will open at'}} {{general-date this.data.speakersCall.endsAt 'date-time-tz-long' tz=this.data.speakersCall.event.timezone}} {{else}} - {{t 'Call for Speakers was closed at'}} {{general-date this.data.speakersCall.endsAt ft='date-time-tz-long' tz=this.data.speakersCall.event.timezone}} + {{t 'Call for Speakers was closed at'}} {{general-date this.data.speakersCall.endsAt 'date-time-tz-long' tz=this.data.speakersCall.event.timezone}} {{/if}}
{{/if}} diff --git a/app/templates/components/public/ticket-list.hbs b/app/templates/components/public/ticket-list.hbs index 7919cf6a708..c6838301d64 100644 --- a/app/templates/components/public/ticket-list.hbs +++ b/app/templates/components/public/ticket-list.hbs @@ -28,7 +28,7 @@ {{ticket.description}} {{/if}}
- Sale ends on {{general-date ticket.salesEndsAt ft='date-time-tz-long' tz=@event.timezone}} + Sale ends on {{general-date ticket.salesEndsAt 'date-time-tz-long' tz=@event.timezone}}
diff --git a/app/templates/components/session-card.hbs b/app/templates/components/session-card.hbs index cb67a4ed2bd..261bface4b9 100644 --- a/app/templates/components/session-card.hbs +++ b/app/templates/components/session-card.hbs @@ -20,7 +20,7 @@
{{#if this.session.startsAt}} - {{general-date this.session.startsAt ft='date-time-short'}} + {{general-date this.session.startsAt 'date-time-short'}} {{else}} {{t 'Session Not Yet Scheduled'}} {{/if}} diff --git a/app/templates/components/ui-table/cell/cell-event-date.hbs b/app/templates/components/ui-table/cell/cell-event-date.hbs index 39d2878129d..1d9e2b82ad2 100644 --- a/app/templates/components/ui-table/cell/cell-event-date.hbs +++ b/app/templates/components/ui-table/cell/cell-event-date.hbs @@ -1,11 +1,11 @@ {{#if this.record}} {{#if this.extraRecords.endsAt}}
- {{general-date this.record ft='date-time-tz-short' tz=this.extraRecords.timezone}} + {{general-date this.record 'date-time-tz-short' tz=this.extraRecords.timezone}}
(to)
- {{general-date this.record ft='date-time-tz-short' tz=this.extraRecords.timezone}} + {{general-date this.record 'date-time-tz-short' tz=this.extraRecords.timezone}}
{{else}} diff --git a/app/templates/components/ui-table/cell/cell-simple-date.hbs b/app/templates/components/ui-table/cell/cell-simple-date.hbs index 2eb3ce9369a..3094bd9dce0 100644 --- a/app/templates/components/ui-table/cell/cell-simple-date.hbs +++ b/app/templates/components/ui-table/cell/cell-simple-date.hbs @@ -1,9 +1,9 @@ {{#if this.extraRecords.timezone}} - {{general-date this.record ft='date-time-tz-short' tz=this.extraRecords.timezone}} + {{general-date this.record 'date-time-tz-short' tz=this.extraRecords.timezone}} {{else if this.record}} - {{general-date this.record (if this.props.options.dateFormat this.props.options.dateFormat ft='date-time-short')}} + {{general-date this.record (if this.props.options.dateFormat this.props.options.dateFormat 'date-time-short')}} {{/if}} diff --git a/app/templates/components/ui-table/cell/cell-validity.hbs b/app/templates/components/ui-table/cell/cell-validity.hbs index 9ed7f588054..430d43cb25c 100644 --- a/app/templates/components/ui-table/cell/cell-validity.hbs +++ b/app/templates/components/ui-table/cell/cell-validity.hbs @@ -1,5 +1,5 @@ - {{general-date this.record ft='date-time-short'}} + {{general-date this.record 'date-time-short'}}
To
- {{general-date this.extraRecords.validTill ft='date-time-short'}} + {{general-date this.extraRecords.validTill 'date-time-short'}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs index c8bb5943469..5a5772addeb 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs @@ -1,5 +1,5 @@ {{#if (eq @record.status 'completed')}} - {{general-date @record.completedAt ft='date-time-short'}} + {{general-date @record.completedAt 'date-time-short'}} {{else}} - {{general-date @record.createdAt ft='date-time-short'}} + {{general-date @record.createdAt 'date-time-short'}} {{/if}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs index 2a695275cf0..a183b12089e 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs @@ -10,10 +10,10 @@ {{/if}} {{#if (eq this.record.status 'completed')}} - {{general-date this.record.completedAt ft='date-time-short'}} + {{general-date this.record.completedAt 'date-time-short'}} {{moment-from-now this.record.completedAt}} {{else}} - {{general-date this.record.createdAt ft='date-time-short'}} + {{general-date this.record.createdAt 'date-time-short'}} {{moment-from-now this.record.createdAt}} {{/if}}
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs index 3c0e82f3f1e..a10312890db 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs @@ -1,3 +1,3 @@ - {{general-date this.record ft='date-time-short'}} + {{general-date this.record 'date-time-short'}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs index adbc6166b93..8e92e2dbe93 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs @@ -1,9 +1,9 @@ {{#if this.record}}
- {{general-date this.record ft='date-time-short'}} + {{general-date this.record 'date-time-short'}}
{{else}}
- {{general-date this.extraRecords.createdAt ft='date-time-short'}} + {{general-date this.extraRecords.createdAt 'date-time-short'}}
{{/if}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs index 2df8912305a..c93e05fea22 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs @@ -13,9 +13,9 @@ {{/if}} {{#if this.extraRecords.completedAt}} - {{general-date this.extraRecords.completedAt ft='date-time-short'}} {{moment-from-now this.extraRecords.completedAt}} + {{general-date this.extraRecords.completedAt 'date-time-short'}} {{moment-from-now this.extraRecords.completedAt}} {{else}} - {{general-date this.extraRecords.createdAt ft='date-time-short'}} {{moment-from-now this.extraRecords.createdAt}} + {{general-date this.extraRecords.createdAt 'date-time-short'}} {{moment-from-now this.extraRecords.createdAt}} {{/if}}
diff --git a/app/templates/event-invoice/review.hbs b/app/templates/event-invoice/review.hbs index 5dc8cf5536f..36e0b172c8e 100644 --- a/app/templates/event-invoice/review.hbs +++ b/app/templates/event-invoice/review.hbs @@ -15,10 +15,10 @@ {{t 'Event Name'}}: {{this.model.event.name}}
- {{t 'Date Issued'}}: {{general-date this.model.issuedAt ft='date-short' tz='UTC'}} + {{t 'Date Issued'}}: {{general-date this.model.issuedAt 'date-short' tz='UTC'}}
- {{t 'Due Date'}}: {{general-date this.model.dueAt ft='date-short' tz='UTC'}} + {{t 'Due Date'}}: {{general-date this.model.dueAt 'date-short' tz='UTC'}}
{{t 'Total Invoice Amount'}}: {{currency-symbol this.model.event.paymentCurrency}} {{format-money this.model.amount}} diff --git a/app/templates/explore.hbs b/app/templates/explore.hbs index 7ba1e962178..2cbfd82446f 100644 --- a/app/templates/explore.hbs +++ b/app/templates/explore.hbs @@ -25,13 +25,13 @@ {{/if}} {{#if this.filters.start_date}}
- {{general-date this.filters.start_date ft='date-short'}} + {{general-date this.filters.start_date 'date-short'}}
{{/if}} {{#if this.filters.end_date}}
- {{general-date this.filters.end_date ft='date-short'}} + {{general-date this.filters.end_date 'date-short'}}
{{/if}} diff --git a/app/templates/orders/expired.hbs b/app/templates/orders/expired.hbs index 1bbf1dfc5b9..127565cca2c 100644 --- a/app/templates/orders/expired.hbs +++ b/app/templates/orders/expired.hbs @@ -7,7 +7,7 @@
- {{general-date this.model.event.startsAt ft='date-time-long'}} - {{general-date this.model.event.endsAt ft='date-time-long'}} + {{general-date this.model.event.startsAt 'date-time-long'}} - {{general-date this.model.event.endsAt 'date-time-long'}}
{{this.model.event.locationName}}
diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs index f8fee080df0..5d8f1d530dd 100644 --- a/app/templates/orders/new.hbs +++ b/app/templates/orders/new.hbs @@ -8,7 +8,7 @@
- {{general-date this.model.order.event.startsAt ft='date-time-long'}} - {{general-date this.model.order.event.endsAt ft='date-time-long'}} + {{general-date this.model.order.event.startsAt 'date-time-long'}} - {{general-date this.model.order.event.endsAt 'date-time-long'}}
{{this.model.order.event.locationName}}
diff --git a/app/templates/orders/pending.hbs b/app/templates/orders/pending.hbs index 28f312debcb..8077f289792 100644 --- a/app/templates/orders/pending.hbs +++ b/app/templates/orders/pending.hbs @@ -8,7 +8,7 @@
- {{general-date this.model.order.event.startsAt ft='date-time-long'}} - {{general-date this.model.order.event.endsAt ft='date-time-long'}} + {{general-date this.model.order.event.startsAt 'date-time-long'}} - {{general-date this.model.order.event.endsAt 'date-time-long'}}
{{this.model.order.event.locationName}}
diff --git a/app/templates/orders/view.hbs b/app/templates/orders/view.hbs index 42c6913aa88..cf1e520dc62 100644 --- a/app/templates/orders/view.hbs +++ b/app/templates/orders/view.hbs @@ -7,7 +7,7 @@
- {{general-date this.model.order.event.startsAt ft='date-time-long'}} - {{general-date this.model.order.event.endsAt ft='date-time-long'}} + {{general-date this.model.order.event.startsAt 'date-time-long'}} - {{general-date this.model.order.event.endsAt 'date-time-long'}}
{{this.model.order.event.locationName}}
diff --git a/app/templates/public.hbs b/app/templates/public.hbs index 72624cf2cdc..4bf89d25733 100644 --- a/app/templates/public.hbs +++ b/app/templates/public.hbs @@ -9,9 +9,9 @@ {{/if}}
-

{{general-date this.model.startsAt ft='date-time-tz-long' tz=this.model.timezone}}

+

{{general-date this.model.startsAt 'date-time-tz-long' tz=this.model.timezone}}

{{#if this.displayEndDate}} -
{{t 'To'}} {{general-date this.model.endsAt ft='date-time-tz-long' tz=this.model.timezone}}
+
{{t 'To'}} {{general-date this.model.endsAt 'date-time-tz-long' tz=this.model.timezone}}
{{/if}}

{{this.model.name}}

{{this.headerLocation}}

diff --git a/app/templates/public/sessions.hbs b/app/templates/public/sessions.hbs index e1c4c542a56..fe314771115 100644 --- a/app/templates/public/sessions.hbs +++ b/app/templates/public/sessions.hbs @@ -3,7 +3,7 @@
{{t 'All'}} {{#each this.allDates as |date|}} - {{general-date date ft='date-short'}} + {{general-date date 'date-short'}} {{/each}} Date: Mon, 30 Nov 2020 16:55:52 +0530 Subject: [PATCH 4/8] Added new format --- app/controllers/admin/messages/list.js | 5 +---- app/controllers/admin/sessions/list.js | 15 +++------------ app/controllers/admin/users/list.js | 10 ++-------- app/controllers/events/view/sessions/list.js | 10 ++-------- .../events/view/tickets/orders/list.js | 1 - app/helpers/general-date.js | 3 ++- .../components/ui-table/cell/cell-simple-date.hbs | 2 +- app/templates/public/sessions.hbs | 2 +- 8 files changed, 12 insertions(+), 36 deletions(-) diff --git a/app/controllers/admin/messages/list.js b/app/controllers/admin/messages/list.js index bdb21cc9657..6051cb5b0d4 100644 --- a/app/controllers/admin/messages/list.js +++ b/app/controllers/admin/messages/list.js @@ -52,10 +52,7 @@ get columns() { valuePath : 'sentAt', headerComponent : 'tables/headers/sort', isSortable : true, - cellComponent : 'ui-table/cell/cell-simple-date', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + cellComponent : 'ui-table/cell/cell-simple-date' } ]; diff --git a/app/controllers/admin/sessions/list.js b/app/controllers/admin/sessions/list.js index 6801f9988fe..c90d40e754e 100644 --- a/app/controllers/admin/sessions/list.js +++ b/app/controllers/admin/sessions/list.js @@ -32,30 +32,21 @@ export default class extends Controller.extend(EmberTableControllerMixin) { valuePath : 'submittedAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + headerComponent : 'tables/headers/sort' }, { name : this.l10n.t('Starts At'), valuePath : 'startsAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + headerComponent : 'tables/headers/sort' }, { name : this.l10n.t('Ends At'), valuePath : 'endsAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + headerComponent : 'tables/headers/sort' }, { name : this.l10n.t('Actions'), diff --git a/app/controllers/admin/users/list.js b/app/controllers/admin/users/list.js index 0ef4ed33563..a182d15b037 100644 --- a/app/controllers/admin/users/list.js +++ b/app/controllers/admin/users/list.js @@ -70,20 +70,14 @@ export default class extends Controller.extend(EmberTableControllerMixin) { valuePath : 'createdAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + headerComponent : 'tables/headers/sort' }, { name : this.l10n.t('Last Accessed'), valuePath : 'lastAccessedAt', isSortable : true, headerComponent : 'tables/headers/sort', - cellComponent : 'ui-table/cell/cell-simple-date', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + cellComponent : 'ui-table/cell/cell-simple-date' } ]; } diff --git a/app/controllers/events/view/sessions/list.js b/app/controllers/events/view/sessions/list.js index ac58f7695f6..b8153f862e0 100644 --- a/app/controllers/events/view/sessions/list.js +++ b/app/controllers/events/view/sessions/list.js @@ -94,19 +94,13 @@ export default class extends Controller.extend(EmberTableControllerMixin) { name : this.l10n.t('Submission Date'), width : 90, valuePath : 'submittedAt', - cellComponent : 'ui-table/cell/cell-simple-date', - options : { - dateFormat: 'D MMM, YYYY h:mm A (z)' - } + cellComponent : 'ui-table/cell/cell-simple-date' }, { name : this.l10n.t('Last Modified'), width : 90, valuePath : 'lastModifiedAt', - cellComponent : 'ui-table/cell/cell-simple-date', - options : { - dateFormat: 'D MMM, YYYY h:mm A (z)' - } + cellComponent : 'ui-table/cell/cell-simple-date' }, { name : this.l10n.t('Notify'), diff --git a/app/controllers/events/view/tickets/orders/list.js b/app/controllers/events/view/tickets/orders/list.js index 380fc2fc204..5f537ebd03f 100644 --- a/app/controllers/events/view/tickets/orders/list.js +++ b/app/controllers/events/view/tickets/orders/list.js @@ -35,7 +35,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) { cellComponent : 'ui-table/cell/events/view/tickets/orders/cell-date', headerComponent : 'tables/headers/sort', width : 100, - dateFormat : 'D MMM, YYYY h:mm A (z)', isSortable : true }, { diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js index 18410b7989c..b29f9367e36 100644 --- a/app/helpers/general-date.js +++ b/app/helpers/general-date.js @@ -6,7 +6,8 @@ const dateFormats = { 'date-time-tz-long' : 'dddd, D MMMM, YYYY h:mm A (z)', 'date-time-short' : 'D MMM, YYYY h:mm A', 'date-time-tz-short' : 'D MMM, YYYY h:mm A (z)', - 'date-short' : 'D MMM, YYYY' + 'date-short' : 'D MMM, YYYY', + 'time-tz-short' : 'h:mm A (z)' }; const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']); diff --git a/app/templates/components/ui-table/cell/cell-simple-date.hbs b/app/templates/components/ui-table/cell/cell-simple-date.hbs index 3094bd9dce0..5b1c06c2217 100644 --- a/app/templates/components/ui-table/cell/cell-simple-date.hbs +++ b/app/templates/components/ui-table/cell/cell-simple-date.hbs @@ -4,6 +4,6 @@ {{else if this.record}} - {{general-date this.record (if this.props.options.dateFormat this.props.options.dateFormat 'date-time-short')}} + {{general-date this.record 'date-time-short'}} {{/if}} diff --git a/app/templates/public/sessions.hbs b/app/templates/public/sessions.hbs index fe314771115..81de1c16ba5 100644 --- a/app/templates/public/sessions.hbs +++ b/app/templates/public/sessions.hbs @@ -59,7 +59,7 @@

- {{general-date session.startsAt 'h:mm A (z)' tz=this.timezone}} + {{general-date session.startsAt 'time-tz-short' tz=this.timezone}}

From bb0f17d01aab6f2b2d1d780fd4e5d73ea11e0e6b Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Wed, 2 Dec 2020 18:24:39 +0530 Subject: [PATCH 5/8] Imporved code-1 --- app/controllers/admin/messages/list.js | 5 ++++- app/controllers/admin/sessions/list.js | 15 ++++++++++++--- app/controllers/admin/users/list.js | 10 ++++++++-- app/controllers/events/view/sessions/list.js | 10 ++++++++-- .../events/view/tickets/orders/list.js | 1 + .../components/ui-table/cell/cell-simple-date.hbs | 2 +- 6 files changed, 34 insertions(+), 9 deletions(-) diff --git a/app/controllers/admin/messages/list.js b/app/controllers/admin/messages/list.js index 6051cb5b0d4..bdb21cc9657 100644 --- a/app/controllers/admin/messages/list.js +++ b/app/controllers/admin/messages/list.js @@ -52,7 +52,10 @@ get columns() { valuePath : 'sentAt', headerComponent : 'tables/headers/sort', isSortable : true, - cellComponent : 'ui-table/cell/cell-simple-date' + cellComponent : 'ui-table/cell/cell-simple-date', + options : { + dateFormat: 'D MMM, YYYY h:mm A' + } } ]; diff --git a/app/controllers/admin/sessions/list.js b/app/controllers/admin/sessions/list.js index c90d40e754e..6801f9988fe 100644 --- a/app/controllers/admin/sessions/list.js +++ b/app/controllers/admin/sessions/list.js @@ -32,21 +32,30 @@ export default class extends Controller.extend(EmberTableControllerMixin) { valuePath : 'submittedAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort' + headerComponent : 'tables/headers/sort', + options : { + dateFormat: 'D MMM, YYYY h:mm A' + } }, { name : this.l10n.t('Starts At'), valuePath : 'startsAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort' + headerComponent : 'tables/headers/sort', + options : { + dateFormat: 'D MMM, YYYY h:mm A' + } }, { name : this.l10n.t('Ends At'), valuePath : 'endsAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort' + headerComponent : 'tables/headers/sort', + options : { + dateFormat: 'D MMM, YYYY h:mm A' + } }, { name : this.l10n.t('Actions'), diff --git a/app/controllers/admin/users/list.js b/app/controllers/admin/users/list.js index a182d15b037..0ef4ed33563 100644 --- a/app/controllers/admin/users/list.js +++ b/app/controllers/admin/users/list.js @@ -70,14 +70,20 @@ export default class extends Controller.extend(EmberTableControllerMixin) { valuePath : 'createdAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort' + headerComponent : 'tables/headers/sort', + options : { + dateFormat: 'D MMM, YYYY h:mm A' + } }, { name : this.l10n.t('Last Accessed'), valuePath : 'lastAccessedAt', isSortable : true, headerComponent : 'tables/headers/sort', - cellComponent : 'ui-table/cell/cell-simple-date' + cellComponent : 'ui-table/cell/cell-simple-date', + options : { + dateFormat: 'D MMM, YYYY h:mm A' + } } ]; } diff --git a/app/controllers/events/view/sessions/list.js b/app/controllers/events/view/sessions/list.js index b8153f862e0..ac58f7695f6 100644 --- a/app/controllers/events/view/sessions/list.js +++ b/app/controllers/events/view/sessions/list.js @@ -94,13 +94,19 @@ export default class extends Controller.extend(EmberTableControllerMixin) { name : this.l10n.t('Submission Date'), width : 90, valuePath : 'submittedAt', - cellComponent : 'ui-table/cell/cell-simple-date' + cellComponent : 'ui-table/cell/cell-simple-date', + options : { + dateFormat: 'D MMM, YYYY h:mm A (z)' + } }, { name : this.l10n.t('Last Modified'), width : 90, valuePath : 'lastModifiedAt', - cellComponent : 'ui-table/cell/cell-simple-date' + cellComponent : 'ui-table/cell/cell-simple-date', + options : { + dateFormat: 'D MMM, YYYY h:mm A (z)' + } }, { name : this.l10n.t('Notify'), diff --git a/app/controllers/events/view/tickets/orders/list.js b/app/controllers/events/view/tickets/orders/list.js index 5f537ebd03f..380fc2fc204 100644 --- a/app/controllers/events/view/tickets/orders/list.js +++ b/app/controllers/events/view/tickets/orders/list.js @@ -35,6 +35,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) { cellComponent : 'ui-table/cell/events/view/tickets/orders/cell-date', headerComponent : 'tables/headers/sort', width : 100, + dateFormat : 'D MMM, YYYY h:mm A (z)', isSortable : true }, { diff --git a/app/templates/components/ui-table/cell/cell-simple-date.hbs b/app/templates/components/ui-table/cell/cell-simple-date.hbs index 5b1c06c2217..3094bd9dce0 100644 --- a/app/templates/components/ui-table/cell/cell-simple-date.hbs +++ b/app/templates/components/ui-table/cell/cell-simple-date.hbs @@ -4,6 +4,6 @@ {{else if this.record}} - {{general-date this.record 'date-time-short'}} + {{general-date this.record (if this.props.options.dateFormat this.props.options.dateFormat 'date-time-short')}} {{/if}} From 7c3f1885ca9ce0e7dd199ef9f5ffc200020110df Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Wed, 2 Dec 2020 20:08:57 +0530 Subject: [PATCH 6/8] Revert "Imporved code-1" This reverts commit bb0f17d01aab6f2b2d1d780fd4e5d73ea11e0e6b. --- app/controllers/admin/messages/list.js | 5 +---- app/controllers/admin/sessions/list.js | 15 +++------------ app/controllers/admin/users/list.js | 10 ++-------- app/controllers/events/view/sessions/list.js | 10 ++-------- .../events/view/tickets/orders/list.js | 1 - .../components/ui-table/cell/cell-simple-date.hbs | 2 +- 6 files changed, 9 insertions(+), 34 deletions(-) diff --git a/app/controllers/admin/messages/list.js b/app/controllers/admin/messages/list.js index bdb21cc9657..6051cb5b0d4 100644 --- a/app/controllers/admin/messages/list.js +++ b/app/controllers/admin/messages/list.js @@ -52,10 +52,7 @@ get columns() { valuePath : 'sentAt', headerComponent : 'tables/headers/sort', isSortable : true, - cellComponent : 'ui-table/cell/cell-simple-date', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + cellComponent : 'ui-table/cell/cell-simple-date' } ]; diff --git a/app/controllers/admin/sessions/list.js b/app/controllers/admin/sessions/list.js index 6801f9988fe..c90d40e754e 100644 --- a/app/controllers/admin/sessions/list.js +++ b/app/controllers/admin/sessions/list.js @@ -32,30 +32,21 @@ export default class extends Controller.extend(EmberTableControllerMixin) { valuePath : 'submittedAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + headerComponent : 'tables/headers/sort' }, { name : this.l10n.t('Starts At'), valuePath : 'startsAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + headerComponent : 'tables/headers/sort' }, { name : this.l10n.t('Ends At'), valuePath : 'endsAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + headerComponent : 'tables/headers/sort' }, { name : this.l10n.t('Actions'), diff --git a/app/controllers/admin/users/list.js b/app/controllers/admin/users/list.js index 0ef4ed33563..a182d15b037 100644 --- a/app/controllers/admin/users/list.js +++ b/app/controllers/admin/users/list.js @@ -70,20 +70,14 @@ export default class extends Controller.extend(EmberTableControllerMixin) { valuePath : 'createdAt', cellComponent : 'ui-table/cell/cell-simple-date', isSortable : true, - headerComponent : 'tables/headers/sort', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + headerComponent : 'tables/headers/sort' }, { name : this.l10n.t('Last Accessed'), valuePath : 'lastAccessedAt', isSortable : true, headerComponent : 'tables/headers/sort', - cellComponent : 'ui-table/cell/cell-simple-date', - options : { - dateFormat: 'D MMM, YYYY h:mm A' - } + cellComponent : 'ui-table/cell/cell-simple-date' } ]; } diff --git a/app/controllers/events/view/sessions/list.js b/app/controllers/events/view/sessions/list.js index ac58f7695f6..b8153f862e0 100644 --- a/app/controllers/events/view/sessions/list.js +++ b/app/controllers/events/view/sessions/list.js @@ -94,19 +94,13 @@ export default class extends Controller.extend(EmberTableControllerMixin) { name : this.l10n.t('Submission Date'), width : 90, valuePath : 'submittedAt', - cellComponent : 'ui-table/cell/cell-simple-date', - options : { - dateFormat: 'D MMM, YYYY h:mm A (z)' - } + cellComponent : 'ui-table/cell/cell-simple-date' }, { name : this.l10n.t('Last Modified'), width : 90, valuePath : 'lastModifiedAt', - cellComponent : 'ui-table/cell/cell-simple-date', - options : { - dateFormat: 'D MMM, YYYY h:mm A (z)' - } + cellComponent : 'ui-table/cell/cell-simple-date' }, { name : this.l10n.t('Notify'), diff --git a/app/controllers/events/view/tickets/orders/list.js b/app/controllers/events/view/tickets/orders/list.js index 380fc2fc204..5f537ebd03f 100644 --- a/app/controllers/events/view/tickets/orders/list.js +++ b/app/controllers/events/view/tickets/orders/list.js @@ -35,7 +35,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) { cellComponent : 'ui-table/cell/events/view/tickets/orders/cell-date', headerComponent : 'tables/headers/sort', width : 100, - dateFormat : 'D MMM, YYYY h:mm A (z)', isSortable : true }, { diff --git a/app/templates/components/ui-table/cell/cell-simple-date.hbs b/app/templates/components/ui-table/cell/cell-simple-date.hbs index 3094bd9dce0..5b1c06c2217 100644 --- a/app/templates/components/ui-table/cell/cell-simple-date.hbs +++ b/app/templates/components/ui-table/cell/cell-simple-date.hbs @@ -4,6 +4,6 @@ {{else if this.record}} - {{general-date this.record (if this.props.options.dateFormat this.props.options.dateFormat 'date-time-short')}} + {{general-date this.record 'date-time-short'}} {{/if}} From 5b8baf3e757ed0254df0eab55b40342ddebb57d4 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Wed, 2 Dec 2020 20:10:04 +0530 Subject: [PATCH 7/8] Fixed --- app/templates/components/ui-table/cell/cell-simple-date.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/ui-table/cell/cell-simple-date.hbs b/app/templates/components/ui-table/cell/cell-simple-date.hbs index 5b1c06c2217..3094bd9dce0 100644 --- a/app/templates/components/ui-table/cell/cell-simple-date.hbs +++ b/app/templates/components/ui-table/cell/cell-simple-date.hbs @@ -4,6 +4,6 @@ {{else if this.record}} - {{general-date this.record 'date-time-short'}} + {{general-date this.record (if this.props.options.dateFormat this.props.options.dateFormat 'date-time-short')}} {{/if}} From d22cff7db8724c9a748b2c40b05d9421d250759d Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Thu, 3 Dec 2020 13:15:33 +0530 Subject: [PATCH 8/8] Fixed replaceAll function --- app/helpers/general-date.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js index b29f9367e36..95c48cb44f7 100644 --- a/app/helpers/general-date.js +++ b/app/helpers/general-date.js @@ -20,7 +20,7 @@ export function generalDate(params, { tz }) { let format = (dateFormats[params[1]] || params[1]) || 'h:mm A, MMMM Do YYYY (z)'; if (!locales12Hours.has(local)) { - format = format.replaceAll('h', 'H'); + format = format.replace(/h/g, 'H'); format = format.replace(' A', ''); format = format.replace(' a', ''); }