Skip to content

Commit f0869d9

Browse files
author
DIVYAM TAYAL
authored
chore: Change general-date helper format argument (#5828)
1 parent cfc845f commit f0869d9

File tree

32 files changed

+62
-78
lines changed

32 files changed

+62
-78
lines changed

‎app/components/public/add-to-calender.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{{#if this.isSingleDay}}
66
{{general-date @event.startsAt "dddd, D MMMM, YYYY" tz=@event.timezone}}<br>{{general-date @event.startsAt "h:mm A" tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt "h:mm A" tz=@event.timezone}}
77
{{else}}
8-
{{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}}
8+
{{general-date @event.startsAt 'date-time-long' tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt 'date-time-long' tz=@event.timezone}}
99
{{/if}}
1010
({{this.timezone}})
1111
<br>

‎app/components/public/session-item.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<div class="right floated four wide column">
5656
{{#if @session.startsAt}}
5757
<div class=""><i class="icon map marker alternate"></i>{{@session.microlocation.name}}</div>
58-
<div class="small text"><i class="wait icon"></i>{{general-date @session.startsAt 'D MMM, YYYY h:mm A (z)' tz=@timezone}}</div>
58+
<div class="small text"><i class="wait icon"></i>{{general-date @session.startsAt 'date-time-tz-short' tz=@timezone}}</div>
5959
{{/if}}
6060
</div>
6161
{{/if}}

‎app/controllers/admin/messages/list.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ get columns() {
5252
valuePath : 'sentAt',
5353
headerComponent : 'tables/headers/sort',
5454
isSortable : true,
55-
cellComponent : 'ui-table/cell/cell-simple-date',
56-
options : {
57-
dateFormat: 'D MMM, YYYY h:mm A'
58-
}
55+
cellComponent : 'ui-table/cell/cell-simple-date'
5956
}
6057

6158
];

‎app/controllers/admin/sessions/list.js‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,21 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
3232
valuePath : 'submittedAt',
3333
cellComponent : 'ui-table/cell/cell-simple-date',
3434
isSortable : true,
35-
headerComponent : 'tables/headers/sort',
36-
options : {
37-
dateFormat: 'D MMM, YYYY h:mm A'
38-
}
35+
headerComponent : 'tables/headers/sort'
3936
},
4037
{
4138
name : this.l10n.t('Starts At'),
4239
valuePath : 'startsAt',
4340
cellComponent : 'ui-table/cell/cell-simple-date',
4441
isSortable : true,
45-
headerComponent : 'tables/headers/sort',
46-
options : {
47-
dateFormat: 'D MMM, YYYY h:mm A'
48-
}
42+
headerComponent : 'tables/headers/sort'
4943
},
5044
{
5145
name : this.l10n.t('Ends At'),
5246
valuePath : 'endsAt',
5347
cellComponent : 'ui-table/cell/cell-simple-date',
5448
isSortable : true,
55-
headerComponent : 'tables/headers/sort',
56-
options : {
57-
dateFormat: 'D MMM, YYYY h:mm A'
58-
}
49+
headerComponent : 'tables/headers/sort'
5950
},
6051
{
6152
name : this.l10n.t('Actions'),

‎app/controllers/admin/users/list.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,14 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
7070
valuePath : 'createdAt',
7171
cellComponent : 'ui-table/cell/cell-simple-date',
7272
isSortable : true,
73-
headerComponent : 'tables/headers/sort',
74-
options : {
75-
dateFormat: 'D MMM, YYYY h:mm A'
76-
}
73+
headerComponent : 'tables/headers/sort'
7774
},
7875
{
7976
name : this.l10n.t('Last Accessed'),
8077
valuePath : 'lastAccessedAt',
8178
isSortable : true,
8279
headerComponent : 'tables/headers/sort',
83-
cellComponent : 'ui-table/cell/cell-simple-date',
84-
options : {
85-
dateFormat: 'D MMM, YYYY h:mm A'
86-
}
80+
cellComponent : 'ui-table/cell/cell-simple-date'
8781
}
8882
];
8983
}

‎app/controllers/events/view/sessions/list.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,13 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
7171
name : this.l10n.t('Submission Date'),
7272
width : 90,
7373
valuePath : 'submittedAt',
74-
cellComponent : 'ui-table/cell/cell-simple-date',
75-
options : {
76-
dateFormat: 'D MMM, YYYY h:mm A (z)'
77-
}
74+
cellComponent : 'ui-table/cell/cell-simple-date'
7875
},
7976
{
8077
name : this.l10n.t('Last Modified'),
8178
width : 90,
8279
valuePath : 'lastModifiedAt',
83-
cellComponent : 'ui-table/cell/cell-simple-date',
84-
options : {
85-
dateFormat: 'D MMM, YYYY h:mm A (z)'
86-
}
80+
cellComponent : 'ui-table/cell/cell-simple-date'
8781
},
8882
{
8983
name : this.l10n.t('Notify'),

‎app/controllers/events/view/tickets/orders/list.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
3535
cellComponent : 'ui-table/cell/events/view/tickets/orders/cell-date',
3636
headerComponent : 'tables/headers/sort',
3737
width : 100,
38-
dateFormat : 'D MMM, YYYY h:mm A (z)',
3938
isSortable : true
4039
},
4140
{

‎app/helpers/general-date.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
11
import Helper from '@ember/component/helper';
22
import moment from 'moment';
33

4+
const dateFormats = {
5+
'date-time-long' : 'dddd, D MMMM, YYYY h:mm A',
6+
'date-time-tz-long' : 'dddd, D MMMM, YYYY h:mm A (z)',
7+
'date-time-short' : 'D MMM, YYYY h:mm A',
8+
'date-time-tz-short' : 'D MMM, YYYY h:mm A (z)',
9+
'date-short' : 'D MMM, YYYY',
10+
'time-tz-short' : 'h:mm A (z)'
11+
};
12+
413
const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']);
514

615
export function generalDate(params, { tz }) {
716
const timezone = tz || moment.tz.guess();
817

918
const local = moment(params[0]).tz(timezone).locale();
1019

11-
let format = params[1] || 'h:mm A, MMMM Do YYYY (z)';
20+
let format = (dateFormats[params[1]] || params[1]) || 'h:mm A, MMMM Do YYYY (z)';
1221

1322
if (!locales12Hours.has(local)) {
14-
format = format.replaceAll('h', 'H');
23+
format = format.replace(/h/g, 'H');
1524
format = format.replace(' A', '');
1625
format = format.replace(' a', '');
1726
}

‎app/templates/admin/sales/revenue.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
{{order.name}}
3939
</td>
4040
<td>
41-
{{general-date order.eventDate 'D MMM, YYYY'}}
41+
{{general-date order.eventDate 'date-short'}}
4242
</td>
4343
<td class="right aligned">
4444
{{order.ticketCount}}

‎app/templates/components/event-invoice/event-info.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<div class="ui padded segment">
1313
<strong>{{t 'At'}} {{this.event.locationName}}</strong>
1414
<br>
15-
<strong>{{t 'From'}}:</strong> {{general-date this.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}}
15+
<strong>{{t 'From'}}:</strong> {{general-date this.event.startsAt 'date-time-long'}}
1616
<br>
17-
<strong>{{t 'To'}}:</strong> {{general-date this.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
17+
<strong>{{t 'To'}}:</strong> {{general-date this.event.endsAt 'date-time-long'}}
1818
{{#if this.event.ownerName}}
1919
<br>
2020
<strong>{{t 'Organized By'}}:</strong> {{this.event.ownerName}}

0 commit comments

Comments
 (0)