Merge branch 'patch-2' of https://github.com/yo-less/MagicMirror into yo-less-patch-2

CHANGELOG.md

@@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Updated
 - Force fullscreen when kioskmode is active.
 
+### Added
+- Added ability to remove tags from the beginning or end of newsfeed items in 'newsfeed.js'.
+- Added ability to define "the day after tomorrow" for calendar events (Definition for German already included).
+
 ## [2.0.4] - 2016-08-07
 
 ### Added

modules/default/calendar/calendar.js

@@ -150,6 +150,16 @@ Module.register("calendar",{
 					timeWrapper.innerHTML = this.translate("TODAY");
 				} else if (event.startDate - now < one_day && event.startDate - now > 0) {
 					timeWrapper.innerHTML = this.translate("TOMORROW");
+				} else if (event.startDate - now < 2*one_day && event.startDate - now > 0) {
+				/*Provide ability to show "the day after tomorrow" instead of "in a day" 
+				 *if "DAYAFTERTOMORROW" is configured in a language's translation .json file, 
+				 *,which can be found in MagicMirror/translations/
+				 */
+					if (this.translate('DAYAFTERTOMORROW') !== 'DAYAFTERTOMORROW') {
+    						timeWrapper.innerHTML = this.translate("DAYAFTERTOMORROW");
+					} else {
+    						timeWrapper.innerHTML = moment(event.startDate, "x").fromNow();
+					}
 				} else {
 					/* Check to see if the user displays absolute or relative dates with their events
 					 * Also check to see if an event is happening within an 'urgency' time frameElement

translations/de.json

@@ -5,6 +5,7 @@
 	/* CALENDAR */
 	"TODAY": "Heute",
 	"TOMORROW": "Morgen",
+	"DAYAFTERTOMORROW": "Übermorgen",
 	"RUNNING": "noch",
 	"EMPTY": "Keine Termine.",
 

translations/nl.json

@@ -5,7 +5,7 @@
 	/* CALENDAR */
 	"TODAY": "Vandaag",
 	"TOMORROW": "Morgen",
-	"RUNNING": "Eindigd over",
+	"RUNNING": "Eindigt over",
 	"EMPTY": "Geen geplande afspraken.",
 
 	/* WEATHER */