Merge pull request #2414 from ashishtank/FeelsLikeCleanup

Feels like translation code cleanup

modules/default/currentweather/currentweather.js

@@ -258,13 +258,9 @@ Module.register("currentweather", {
 
 			var feelsLike = document.createElement("span");
 			feelsLike.className = "dimmed";
-			var feelsLikeHtml = this.translate("FEELS");
-			if (feelsLikeHtml.indexOf("{DEGREE}") > -1) {
-				feelsLikeHtml = this.translate("FEELS", {
-					DEGREE: this.feelsLike + degreeLabel
-				});
-			} else feelsLikeHtml += " " + this.feelsLike + degreeLabel;
-			feelsLike.innerHTML = feelsLikeHtml;
+			feelsLike.innerHTML = this.translate("FEELS", {
+				DEGREE: this.feelsLike + degreeLabel
+			});
 			small.appendChild(feelsLike);
 
 			wrapper.appendChild(small);

modules/default/weather/current.njk

@@ -69,10 +69,7 @@
         <div class="normal medium">
             {% if config.showFeelsLike %}
                 <span class="dimmed">
-                    {{ "FEELS" | translate({DEGREE: current.feelsLike() | roundValue | unit("temperature") | decimalSymbol }) }} 
-					{% if not config.feelsLikeWithDegree %}
-					{{ current.feelsLike() | roundValue | unit("temperature") | decimalSymbol }}
-					{% endif %}
+                    {{ "FEELS" | translate({DEGREE: current.feelsLike() | roundValue | unit("temperature") | decimalSymbol }) }}
                 </span>
             {% endif %}
             {% if config.showPrecipitationAmount %}

modules/default/weather/weather.js

@@ -52,8 +52,7 @@ Module.register("weather", {
 		onlyTemp: false,
 		showPrecipitationAmount: false,
 		colored: false,
-		showFeelsLike: true,
-		feelsLikeWithDegree: false
+		showFeelsLike: true
 	},
 
 	// Module properties.
@@ -89,8 +88,6 @@ Module.register("weather", {
 		// Let the weather provider know we are starting.
 		this.weatherProvider.start();
 
-		this.config.feelsLikeWithDegree = this.translate("FEELS").indexOf("{DEGREE}") > -1;
-
 		// Add custom filters
 		this.addFilters();