diff --git a/modules/default/currentweather/README.md b/modules/default/currentweather/README.md index c5ba6108..faa24db4 100644 --- a/modules/default/currentweather/README.md +++ b/modules/default/currentweather/README.md @@ -46,6 +46,7 @@ The following properties can be configured: | `onlyTemp` | Show only current Temperature and weather icon.

**Possible values:** `true` or `false`
**Default value:** `false` | `useBeaufort` | Pick between using the Beaufort scale for wind speed or using the default units.

**Possible values:** `true` or `false`
**Default value:** `true` | `lang` | The language of the days.

**Possible values:** `en`, `nl`, `ru`, etc ...
**Default value:** uses value of _config.language_ +| `decimalComma` | Whether or not to show a decimal comma instead of a decimal point for temperature values.

**Possible values:** `true` or `false`
**Default value:** `false` | `initialLoadDelay` | The initial delay before loading. If you have multiple modules that use the same API key, you might want to delay one of the requests. (Milliseconds)

**Possible values:** `1000` - `5000`
**Default value:** `0` | `retryDelay` | The delay before retrying after a request failure. (Milliseconds)

**Possible values:** `1000` - `60000`
**Default value:** `2500` | `apiVersion` | The OpenWeatherMap API version to use.

**Default value:** `2.5` diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index 0352b7f9..dd8f6ec5 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -24,6 +24,7 @@ Module.register("currentweather",{ showWindDirectionAsArrow: false, useBeaufort: true, lang: config.language, + decimalComma: false, showHumidity: false, degreeLabel: false, showIndoorTemperature: false, @@ -211,7 +212,12 @@ Module.register("currentweather",{ var temperature = document.createElement("span"); temperature.className = "bright"; - temperature.innerHTML = " " + this.temperature + "°" + degreeLabel; + if (this.config.decimalComma) { + temperature.innerHTML = " " + this.temperature.replace(".",",") + "°" + degreeLabel; + } + else { + temperature.innerHTML = " " + this.temperature + "°" + degreeLabel; + } large.appendChild(temperature); if (this.config.showIndoorTemperature && this.indoorTemperature) { @@ -221,7 +227,12 @@ Module.register("currentweather",{ var indoorTemperatureElem = document.createElement("span"); indoorTemperatureElem.className = "bright"; - indoorTemperatureElem.innerHTML = " " + this.indoorTemperature + "°" + degreeLabel; + if (this.config.decimalComma) { + indoorTemperatureElem.innerHTML = " " + this.indoorTemperature.replace(".",",") + "°" + degreeLabel; + } + else { + indoorTemperatureElem.innerHTML = " " + this.indoorTemperature + "°" + degreeLabel; + } large.appendChild(indoorTemperatureElem); } diff --git a/modules/default/weatherforecast/README.md b/modules/default/weatherforecast/README.md index 3568f7de..71213c01 100644 --- a/modules/default/weatherforecast/README.md +++ b/modules/default/weatherforecast/README.md @@ -37,6 +37,7 @@ The following properties can be configured: | `updateInterval` | How often does the content needs to be fetched? (Milliseconds)

**Possible values:** `1000` - `86400000`
**Default value:** `600000` (10 minutes) | `animationSpeed` | Speed of the update animation. (Milliseconds)

**Possible values:**`0` - `5000`
**Default value:** `1000` (1 second) | `lang` | The language of the days.

**Possible values:** `en`, `nl`, `ru`, etc ...
**Default value:** uses value of _config.language_ +| `decimalComma` | Whether or not to show a decimal comma instead of a decimal point for temperature values.

**Possible values:** `true` or `false`
**Default value:** `false` | `fade` | Fade the future events to black. (Gradient)

**Possible values:** `true` or `false`
**Default value:** `true` | `fadePoint` | Where to start fade?

**Possible values:** `0` (top of the list) - `1` (bottom of list)
**Default value:** `0.25` | `initialLoadDelay` | The initial delay before loading. If you have multiple modules that use the same API key, you might want to delay one of the requests. (Milliseconds)

**Possible values:** `1000` - `5000`
**Default value:** `2500` (2.5 seconds delay. This delay is used to keep the OpenWeather API happy.) diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js index e357387a..6becce64 100644 --- a/modules/default/weatherforecast/weatherforecast.js +++ b/modules/default/weatherforecast/weatherforecast.js @@ -21,6 +21,7 @@ Module.register("weatherforecast",{ animationSpeed: 1000, timeFormat: config.timeFormat, lang: config.language, + decimalComma: false, fade: true, fadePoint: 0.25, // Start on 1/4th of the list. colored: false, @@ -156,12 +157,22 @@ Module.register("weatherforecast",{ } var maxTempCell = document.createElement("td"); - maxTempCell.innerHTML = forecast.maxTemp + degreeLabel; + if (this.config.decimalComma) { + maxTempCell.innerHTML = forecast.maxTemp.replace(".",",") + degreeLabel; + } + else { + maxTempCell.innerHTML = forecast.maxTemp + degreeLabel; + } maxTempCell.className = "align-right bright max-temp"; row.appendChild(maxTempCell); var minTempCell = document.createElement("td"); - minTempCell.innerHTML = forecast.minTemp + degreeLabel; + if (this.config.decimalComma) { + minTempCell.innerHTML = forecast.minTemp.replace(".",",") + degreeLabel; + } + else { + minTempCell.innerHTML = forecast.minTemp + degreeLabel; + } minTempCell.className = "align-right min-temp"; row.appendChild(minTempCell);