diff --git a/CHANGELOG.md b/CHANGELOG.md index ea7a893c..38ecbe2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ _This release is scheduled to be released on 2022-10-01._ ## Added +- New `showTimeToday` option in calendar module shows time for current-day events even if `timeFormat` is `"relative"` + ## Updated - Removed DAYAFTERTOMORROW from English diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 34d720d3..080e10b9 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -37,6 +37,7 @@ Module.register("calendar", { hidePrivate: false, hideOngoing: false, hideTime: false, + showTimeToday: false, colored: false, coloredSymbolOnly: false, customEvents: [], // Array of {keyword: "", symbol: "", color: ""} where Keyword is a regexp and symbol/color are to be applied for matched @@ -368,7 +369,7 @@ Module.register("calendar", { } else { timeWrapper.innerHTML = this.capFirst( moment(event.startDate, "x").calendar(null, { - sameDay: "[" + this.translate("TODAY") + "]", + sameDay: this.config.showTimeToday ? "LT" : "[" + this.translate("TODAY") + "]", nextDay: "[" + this.translate("TOMORROW") + "]", nextWeek: "dddd", sameElse: event.fullDayEvent ? this.config.fullDayEventDateFormat : this.config.dateFormat