kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2890 from MikeBishop/showTimeToday

Browse Source 
Show time today
This commit is contained in:
Michael Teeuw 2022-07-28 15:25:50 +02:00 committed by GitHub
commit d24fe4e983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -11,6 +11,8 @@ _This release is scheduled to be released on 2022-10-01._
## Added ## Added
- New `showTimeToday` option in calendar module shows time for current-day events even if `timeFormat` is `"relative"`
## Updated ## Updated
- Removed DAYAFTERTOMORROW from English - Removed DAYAFTERTOMORROW from English

3
modules/default/calendar/calendar.js
View File

@ -37,6 +37,7 @@ Module.register("calendar", {
hidePrivate: false, hidePrivate: false,
hideOngoing: false, hideOngoing: false,
hideTime: false, hideTime: false,
showTimeToday: false,
colored: false, colored: false,
coloredSymbolOnly: false, coloredSymbolOnly: false,
customEvents: [], // Array of {keyword: "", symbol: "", color: ""} where Keyword is a regexp and symbol/color are to be applied for matched 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 { } else {
timeWrapper.innerHTML = this.capFirst( timeWrapper.innerHTML = this.capFirst(
moment(event.startDate, "x").calendar(null, { moment(event.startDate, "x").calendar(null, {
sameDay: "[" + this.translate("TODAY") + "]", sameDay: this.config.showTimeToday ? "LT" : "[" + this.translate("TODAY") + "]",
nextDay: "[" + this.translate("TOMORROW") + "]", nextDay: "[" + this.translate("TOMORROW") + "]",
nextWeek: "dddd", nextWeek: "dddd",
sameElse: event.fullDayEvent ? this.config.fullDayEventDateFormat : this.config.dateFormat sameElse: event.fullDayEvent ? this.config.fullDayEventDateFormat : this.config.dateFormat