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

removed unneeded (and unwanted) '.' in calendar (#3003)

Browse Source 
- removed unneeded (and unwanted) '.' after the year in calendar
repeatingCountTitle (fixes #2896)
- update Collaboration.md
This commit is contained in:
Karsten Hassel 2023-01-14 13:47:32 +01:00 committed by GitHub
parent 29e3ec06cb
commit d2327d3d6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@ _This release is scheduled to be released on 2023-04-01._
### Removed ### Removed
- Removed darksky weather provider - Removed darksky weather provider
- Removed unneeded (and unwanted) '.' after the year in calendar repeatingCountTitle (#2896)
### Updated ### Updated

5
Collaboration.md
View File

@ -5,8 +5,13 @@ This document describes how collaborators of this repository should work togethe
- never merge your own PR's - never merge your own PR's
- never merge without someone having approved (approving and merging from same person is allowed) - 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) - 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 ## Issues
- "real" Issues are closed if the problem is solved and the fix is released - "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 - 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

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

@ -271,7 +271,7 @@ Module.register("calendar", {
const thisYear = new Date(parseInt(event.startDate)).getFullYear(), const thisYear = new Date(parseInt(event.startDate)).getFullYear(),
yearDiff = thisYear - event.firstYear; yearDiff = thisYear - event.firstYear;
repeatingCountTitle = ", " + yearDiff + ". " + repeatingCountTitle; repeatingCountTitle = ", " + yearDiff + repeatingCountTitle;
} }
} }