Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop

CHANGELOG.md

@@ -4,12 +4,13 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ---
-
 ## [2.5.0] - Unreleased
 
 *This release is scheduled to be released on 2018-10-01.*
 
 ### Added
+- Support multi-line compliments
+- Simplified Chinese translation for "Feels"
 - Polish translate for "Feels"
 - French translate for "Feels"
 - Translations for newsfeed module
@@ -21,6 +22,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Support for showing end of events through config parameters showEnd and dateEndFormat
 
 ### Fixed
+- Fixed gzip encoded calendar loading issue #1400.
 - Mixup between german and spanish translation for newsfeed.
 - Fixed close dates to be absolute, if no configured in the config.js - module Calendar
 - Fixed the UpdateNotification module message about new commits in the repository, so they can be correctly localized in singular and plural form.
@@ -31,6 +33,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Updated
 
+- Updated Simplified Chinese translation
 - Swedish translations
 - Hungarian translations for the updatenotification module
 - Updated Norsk bokmål translation

css/main.css

@@ -128,6 +128,10 @@ sup {
   text-overflow: ellipsis;
 }
 
+.pre-line {
+  white-space: pre-line;
+}
+
 /**
  * Region Definitions.
  */

modules/default/calendar/calendarfetcher.js

@@ -29,7 +29,8 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 		var opts = {
 			headers: {
 				"User-Agent": "Mozilla/5.0 (Node.js "+ nodeVersion + ") MagicMirror/"  + global.version +  " (https://github.com/MichMich/MagicMirror/)"
-			}
+			},
+			gzip: true
 		};
 
 		if (auth) {

modules/default/compliments/README.md

@@ -107,6 +107,13 @@ config: {
 }
 ````
 
+#### Multi-line compliments:
+Use `\n` to split compliment text into multiple lines, e.g. `First line.\nSecond line.` will be shown as:
+```
+First line.
+Second line.
+```
+
 ### External Compliment File
 You may specify an external file that contains the three compliment arrays. This is particularly useful if you have a
 large number of compliments and do not wish to crowd your `config.js` file with a large array of compliments.

modules/default/compliments/compliments.js

@@ -159,7 +159,7 @@ Module.register("compliments", {
 
 		var compliment = document.createTextNode(complimentText);
 		var wrapper = document.createElement("div");
-		wrapper.className = this.config.classes ? this.config.classes : "thin xlarge bright";
+		wrapper.className = this.config.classes ? this.config.classes : "thin xlarge bright pre-line";
 		wrapper.appendChild(compliment);
 
 		return wrapper;

translations/zh-cn.json

@@ -5,7 +5,9 @@
 	"TOMORROW": "明天",
 	"DAYAFTERTOMORROW": "后天",
 	"RUNNING": "结束日期",
-	"EMPTY": "没有更多的活动。",
+	"EMPTY": "无日程安排。",
+
+	"WEEK": "第{weekNumber}周",
 
 	"N": "北风",
 	"NNE": "北偏东风",
@@ -24,8 +26,10 @@
 	"NW": "西北风",
 	"NNW": "北偏西风",
 
-	"UPDATE_NOTIFICATION": "MagicMirror² 有新的更新",
+	"UPDATE_NOTIFICATION": "MagicMirror²有新的版本。",
-	"UPDATE_NOTIFICATION_MODULE": "模块 {MODULE_NAME} 可更新",
+	"UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME}模块可更新。",
-	"UPDATE_INFO_SINGLE": "当前已安装版本为 {COMMIT_COUNT} commit 落后于分支 {BRANCH_NAME} ",
+	"UPDATE_INFO_SINGLE": "当前已安装版本比{BRANCH_NAME}分支落后{COMMIT_COUNT}次代码更新。",
-	"UPDATE_INFO_MULTIPLE": "当前已安装版本为 {COMMIT_COUNT} commits 落后于分支 {BRANCH_NAME} "
+	"UPDATE_INFO_MULTIPLE": "当前已安装版本比{BRANCH_NAME}分支落后{COMMIT_COUNT}次代码更新。",
+
+	"FEELS": "体感"
 }