diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb8a8c68..dfd9eaa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Slovakian translation
- Alerts now can contain Font Awesome icons
- Notifications display time can be set in request
-- newsfeed: added support for `ARTICLE_INFO_REQUEST` notification
+- Newsfeed: added support for `ARTICLE_INFO_REQUEST` notification
+- Add `name` config option for calendars to be sent along with event broadcasts
### Updated
- Bumped the Electron dependency to v3.0.13 to support the most recent Raspbian. [#1500](https://github.com/MichMich/MagicMirror/issues/1500)
@@ -43,6 +44,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Calendar: Fixed missing calendar fetchers after server process restarts [#1589](https://github.com/MichMich/MagicMirror/issues/1589)
- Notification: fixed background color (was white text on white background)
- Use getHeader instead of data.header when creating the DOM so overwriting the function also propagates into it
+- Fix documentation of `useKMPHwind` option in currentweather
### New weather module
- Fixed weather forecast table display [#1499](https://github.com/MichMich/MagicMirror/issues/1499).
@@ -86,7 +88,6 @@ A huge, huge, huge thanks to user @fewieden for all his hard work on the new `we
- Ignore entries with unparseable details in the calendar module
- Bug showing FullDayEvents one day too long in calendar fixed
- Bug in newsfeed when `removeStartTags` is used on the description [#1478](https://github.com/MichMich/MagicMirror/issues/1478)
-- Fix documentation of `useKMPHwind` option in currentweather
### Updated
- The default calendar setting `showEnd` is changed to `false`.
diff --git a/README.md b/README.md
index 1cadc57a..ee92ca92 100644
--- a/README.md
+++ b/README.md
@@ -128,7 +128,7 @@ The following wiki links are helpful for the initial configuration of your Magic
**Note:** If you used the installer script. This step is already done for you.
2. Modify your required settings. \
- Note: You'll can check your configuration running `npm run config:check` in `/home/pi/MagicMirror`.
+ Note: You can check your configuration running `npm run config:check` in `/home/pi/MagicMirror`.
The following properties can be configured:
diff --git a/modules/default/calendar/README.md b/modules/default/calendar/README.md
index 72aedd74..b2bb5c7f 100755
--- a/modules/default/calendar/README.md
+++ b/modules/default/calendar/README.md
@@ -90,6 +90,7 @@ config: {
| `repeatingCountTitle` | The count title for yearly repating events in this calendar.
**Example:** `'Birthday'`
| `maximumEntries` | The maximum number of events shown. Overrides global setting. **Possible values:** `0` - `100`
| `maximumNumberOfDays` | The maximum number of days in the future. Overrides global setting
+| `name` | The name of the calendar. Included in event broadcasts as `calendarName`.
| `auth` | The object containing options for authentication against the calendar.
| `symbolClass` | Add a class to the cell of symbol.
| `titleClass` | Add a class to the title's cell.
diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
index a6eeb226..d584a9ed 100755
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -569,6 +569,17 @@ Module.register("calendar", {
return this.getCalendarProperty(url, "timeClass", "");
},
+ /* calendarNameForUrl(url)
+ * Retrieves the calendar name for a specific url.
+ *
+ * argument url string - Url to look for.
+ *
+ * return string - The name of the calendar
+ */
+ calendarNameForUrl: function (url) {
+ return this.getCalendarProperty(url, "name", "");
+ },
+
/* colorForUrl(url)
* Retrieves the color for a specific url.
*
@@ -709,6 +720,7 @@ Module.register("calendar", {
for (var e in calendar) {
var event = cloneObject(calendar[e]);
event.symbol = this.symbolsForUrl(url);
+ event.calendarName = this.calendarNameForUrl(url);
event.color = this.colorForUrl(url);
delete event.url;
eventList.push(event);