diff --git a/CHANGELOG.md b/CHANGELOG.md index e15b060c62..08894b20d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ _This release is scheduled to be released on 2023-04-01._ ### Removed - Removed darksky weather provider +- Removed unneeded (and unwanted) '.' after the year in calendar repeatingCountTitle (#2896) ### Updated diff --git a/Collaboration.md b/Collaboration.md index 6be3fecb2a..cb95b38d57 100644 --- a/Collaboration.md +++ b/Collaboration.md @@ -5,8 +5,13 @@ This document describes how collaborators of this repository should work togethe - never merge your own PR's - never merge without someone having approved (approving and merging from same person is allowed) - wait for all approvals requested (or the author decides something different in the comments) +- never merge to `master`, except for releases (because of update notification) ## Issues - "real" Issues are closed if the problem is solved and the fix is released - unrelated Issues (e.g. related to a foreign module) are closed immediately with a comment to open an issue in the module repository or to discuss this further in the forum or discord + +## Releases + +- are done by @MichMich only diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index cecf80ea12..8700fbd26a 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -271,7 +271,7 @@ Module.register("calendar", { const thisYear = new Date(parseInt(event.startDate)).getFullYear(), yearDiff = thisYear - event.firstYear; - repeatingCountTitle = ", " + yearDiff + ". " + repeatingCountTitle; + repeatingCountTitle = ", " + yearDiff + repeatingCountTitle; } }