github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 08:51:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: removes time from date in calendar range at midnight (#10751)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2020-09-28 10:39:21 +02:00
committed by GitHub
parent 4edb769ef2
commit 2b254f4305
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
View File

@ -188,12 +188,16 @@ export default class LocalDateBuilder {
);
if (inCalendarRange && sameTimezone) {
return localDate
.datetimeWithZone(this.localTimezone)
.calendar(
moment.tz(localDate.timezone),
this._calendarFormats(this.time ? this.time : null)
);
const date = localDate.datetimeWithZone(this.localTimezone);
if (date.hours() === 0 && date.minutes() === 0) {
return date.format("dddd");
}
return date.calendar(
moment.tz(localDate.timezone),
this._calendarFormats(this.time ? this.time : null)
);
}
}