tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-08-19 00:39:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix today/yesterday ticket date & hindi bug

Browse Source
This commit is contained in:
Guillermo Giuliana 2021-11-21 03:53:30 -03:00
parent 064856e326
commit d8101eaed2
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/app-components/ticket-list.js
View File

@ -226,7 +226,7 @@ class TicketList extends React.Component {
}
getTableRows() {
return this.getTickets().map(this.gerTicketTableObject.bind(this));
return this.getTickets().map(this.getTicketTableObject.bind(this));
}
getTickets() {
@ -240,7 +240,7 @@ class TicketList extends React.Component {
);
}
gerTicketTableObject(ticket) {
getTicketTableObject(ticket) {
const { date, title, ticketNumber, closed, tags, department, author } = ticket;
const dateTodayWithOutHoursAndMinutes = DateTransformer.getDateToday();
const ticketDateWithOutHoursAndMinutes = Math.floor(DateTransformer.UTCDateToLocalNumericDate(JSON.stringify(date*1)) / 10000);
@ -248,7 +248,7 @@ class TicketList extends React.Component {
const ticketDate = (
((dateTodayWithOutHoursAndMinutes - ticketDateWithOutHoursAndMinutes) > 1) ?
stringTicketLocalDateFormat :
`${(dateTodayWithOutHoursAndMinutes - ticketDateWithOutHoursAndMinutes) ? "Yesterday" : "Today"} at ${stringTicketLocalDateFormat.slice(-5)}`
`${(dateTodayWithOutHoursAndMinutes - ticketDateWithOutHoursAndMinutes) ? i18n("YESTERDAY_AT") : i18n("TODAY_AT")} ${stringTicketLocalDateFormat.slice(-5)}`
);
let titleText = (this.isTicketUnread(ticket)) ? title + ' (1)' : title;

2
client/src/data/languages/en.js
View File

@ -442,6 +442,8 @@ export default {
'TITLE_EDITED': '(title edited)',
'COMMENT_EDITED': '(comment edited)',
'TODAY_AT': 'Today at',
'YESTERDAY_AT': 'Yesterday at',
'LAST_7_DAYS': 'Last 7 days',
'LAST_30_DAYS': 'Last 30 days',
'LAST_90_DAYS': 'Last 90 days',

4
client/src/lib-core/date-transformer.js
View File

@ -6,7 +6,7 @@ const localUTCMins = new Date().getTimezoneOffset();
let language = sessionStore.getConfigs().language;
if (language == 'br') language = 'pt';
if (language == 'cn') language = 'zh-cn';
if (language == 'in') language = 'en';
if (language == 'in') language = 'hi';
if (language == 'jp') language = 'ja';
if (language == 'gr') language = 'el';
@ -15,7 +15,7 @@ export default {
return moment(`${date}`, stringDateFormat);
},
momentToStringDate(date) {
return date.locale(language).format(stringDateFormat);
return date.format(stringDateFormat);
},
UTCDateToLocalNumericDate(date) {
return JSON.parse(this.momentToStringDate(this.stringDateToMoment(date).subtract(localUTCMins, 'minutes')));