Merge pull request #1505 from fwitte/fwitte/change_temperature_unit_d…

…isplay Remove degree symbol for Kelvin scale
MagicMirrorOrg · Jan 3, 2019 · 675c937 · 675c937
2 parents b52da7c + c8f53bd
commit 675c937
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Updated
 
 ### Fixed
+- Fixed temperature displays in currentweather and weatherforecast modules [#1503](https://github.com/MichMich/MagicMirror/issues/1503).
 
 ## [2.6.0] - 2019-01-01
 

diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js
@@ -201,13 +201,13 @@ Module.register("currentweather",{
 		if (this.config.degreeLabel) {
 			switch (this.config.units ) {
 			case "metric":
-				degreeLabel = "C";
+				degreeLabel = " &deg;C";
 				break;
 			case "imperial":
-				degreeLabel = "F";
+				degreeLabel = " &deg;F";
 				break;
 			case "default":
-				degreeLabel = "K";
+				degreeLabel = " K";
 				break;
 			}
 		}
@@ -218,7 +218,7 @@ Module.register("currentweather",{
 
 		var temperature = document.createElement("span");
 		temperature.className = "bright";
-		temperature.innerHTML = " " + this.temperature.replace(".", this.config.decimalSymbol) + "&deg;" + degreeLabel;
+		temperature.innerHTML = " " + this.temperature.replace(".", this.config.decimalSymbol) + degreeLabel;
 		large.appendChild(temperature);
 
 		if (this.config.showIndoorTemperature && this.indoorTemperature) {
@@ -228,7 +228,7 @@ Module.register("currentweather",{
 
 			var indoorTemperatureElem = document.createElement("span");
 			indoorTemperatureElem.className = "bright";
-			indoorTemperatureElem.innerHTML = " " + this.indoorTemperature.replace(".", this.config.decimalSymbol) + "&deg;" + degreeLabel;
+			indoorTemperatureElem.innerHTML = " " + this.indoorTemperature.replace(".", this.config.decimalSymbol) + degreeLabel;
 			large.appendChild(indoorTemperatureElem);
 		}
 
@@ -251,7 +251,7 @@ Module.register("currentweather",{
 
 			var feelsLike = document.createElement("span");
 			feelsLike.className = "dimmed";
-			feelsLike.innerHTML = this.translate("FEELS") + " " + this.feelsLike + "&deg;" + degreeLabel;
+			feelsLike.innerHTML = this.translate("FEELS") + " " + this.feelsLike + degreeLabel;
 			small.appendChild(feelsLike);
 
 			wrapper.appendChild(small);

diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
@@ -142,17 +142,17 @@ Module.register("weatherforecast",{
 			icon.className = "wi weathericon " + forecast.icon;
 			iconCell.appendChild(icon);
 
-			var degreeLabel = "&deg;";
+			var degreeLabel = "";
 			if(this.config.scale) {
 				switch(this.config.units) {
 				case "metric":
-					degreeLabel += " C";
+					degreeLabel = " &deg;C";
 					break;
 				case "imperial":
-					degreeLabel += " F";
+					degreeLabel = " &deg;F";
 					break;
 				case "default":
-					degreeLabel = "K";
+					degreeLabel = " K";
 					break;
 				}
 			}