diff --git a/CHANGELOG.md b/CHANGELOG.md index aaf036aa..e8b7d30f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Screenshot for the weather forecast module - Portuguese translation for "Feels" - Fading for dateheaders timeFormat in Calendar [#1464](https://github.com/MichMich/MagicMirror/issues/1464) +- Documentation for the existing `scale` option in the Weather Forecast module. ### Fixed - Allow to parse recurring calendar events where the start date is before 1900 @@ -30,6 +31,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Updated - The default calendar setting `showEnd` is changed to `false`. +### Changed +- The Weather Forecast module by default displays the ° symbol after every numeric value to be consistent with the Current Weather module. + + ## [2.5.0] - 2018-10-01 ### Added diff --git a/modules/default/weatherforecast/README.md b/modules/default/weatherforecast/README.md index 2a41b003..4be3d9bf 100644 --- a/modules/default/weatherforecast/README.md +++ b/modules/default/weatherforecast/README.md @@ -51,10 +51,11 @@ The following properties can be configured: | `apiBase` | The OpenWeatherMap base URL.

**Default value:** `'http://api.openweathermap.org/data/'` | `forecastEndpoint` | The OpenWeatherMap API endPoint.

**Default value:** `'forecast/daily'` | `appendLocationNameToHeader` | If set to `true`, the returned location name will be appended to the header of the module, if the header is enabled. This is mainly intresting when using calender based weather.

**Default value:** `true` -| `calendarClass` | The class for the calender module to base the event based weather information on.

**Default value:** `'calendar'` +| `calendarClass` | The class for the calendar module to base the event based weather information on.

**Default value:** `'calendar'` | `tableClass` | Name of the classes issued from `main.css`.

**Possible values:** xsmall, small, medium, large, xlarge.
**Default value:** _small._ | `iconTable` | The conversion table to convert the weather conditions to weather-icons.

**Default value:** view table below - `colored` | If set 'colored' to true the min-temp get a blue tone and the max-temp get a red tone.

**Default value:** `'false'` +| `colored` | If set `colored` to `true` the min-temp gets a blue tone and the max-temp gets a red tone.

**Default value:** `'false'` +| `scale ` | If set to `true` the module will display `C` for Celsius degrees and `F` for Fahrenheit degrees after the number, based on the value of the `units` option, otherwise only the ° character is displayed.

**Default value:** `false` #### Default Icon Table ````javascript diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js index 19e004ff..a29abc16 100644 --- a/modules/default/weatherforecast/weatherforecast.js +++ b/modules/default/weatherforecast/weatherforecast.js @@ -142,14 +142,14 @@ Module.register("weatherforecast",{ icon.className = "wi weathericon " + forecast.icon; iconCell.appendChild(icon); - var degreeLabel = ""; + var degreeLabel = "°"; if(this.config.scale) { switch(this.config.units) { case "metric": - degreeLabel = " °C"; + degreeLabel += " C"; break; case "imperial": - degreeLabel = " °F"; + degreeLabel += " F"; break; case "default": degreeLabel = "K";