Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
3cb333efdf
1 changed files with 4 additions and 4 deletions
|
@ -65,7 +65,7 @@ module.exports = {
|
|||
const days = getDaysArray();
|
||||
const months = getMonthsArray();
|
||||
if (date.toDateString() === now.toDateString()) {
|
||||
return this.formatTime(date);
|
||||
return this.formatTime(date, showTwelveHour);
|
||||
} else if (now.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
|
||||
// TODO: use standard date localize function provided in counterpart
|
||||
return _t('%(weekDayName)s %(time)s', {
|
||||
|
@ -78,7 +78,7 @@ module.exports = {
|
|||
weekDayName: days[date.getDay()],
|
||||
monthName: months[date.getMonth()],
|
||||
day: date.getDate(),
|
||||
time: this.formatTime(date),
|
||||
time: this.formatTime(date, showTwelveHour),
|
||||
});
|
||||
}
|
||||
return this.formatFullDate(date, showTwelveHour);
|
||||
|
@ -92,7 +92,7 @@ module.exports = {
|
|||
monthName: months[date.getMonth()],
|
||||
day: date.getDate(),
|
||||
fullYear: date.getFullYear(),
|
||||
time: showTwelveHour ? twelveHourTime(date) : this.formatTime(date),
|
||||
time: this.formatTime(date, showTwelveHour),
|
||||
});
|
||||
},
|
||||
|
||||
|
|
Loading…
Reference in a new issue