Merge pull request #237 from roxasvalor/v2-beta

Added option for units inside of config.js

README.md

@@ -77,6 +77,7 @@ The following properties can be configured:
 | `port` | The port on which the MagicMirror² server will run on. The default value is `8080`. |
 | `language` | The language of the interface. (Note: Not all elements will be localized.) Possible values are `en`, `nl`, `ru`, `fr`, etc., but the default value is `en`. |
 | `timeFormat` | The form of time notation that will be used. Possible values are `12` or `24`. The default is `24`. |
+| `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. The default is `metric`. |
 | `modules` | An array of active modules. **The array must contain objects. See the next table below for more information.** |
 
 Module configuration:

config/config.js.sample

@@ -9,6 +9,7 @@ var config = {
 
 	language: 'en',
 	timeFormat: 24,
+	units: 'metric',
 
 	modules: [
 		{

js/defaults.js

@@ -12,7 +12,8 @@ var defaults = {
 
 	language: "en",
 	timeFormat: 24,
-
+	units: "metric",
+	
 	modules: [
 		{
 			module: "helloworld",

modules/default/currentweather/currentweather.js

@@ -13,7 +13,7 @@ Module.register("currentweather",{
 	defaults: {
 		location: "",
 		appid: "",
-		units: "metric",
+		units: config.units,
 		updateInterval: 10 * 60 * 1000, // every 10 minutes
 		animationSpeed: 1000,
 		timeFormat: config.timeFormat,

modules/default/weatherforecast/weatherforecast.js

@@ -13,7 +13,7 @@ Module.register("weatherforecast",{
 	defaults: {
 		location: "",
 		appid: "",
-		units: "metric",
+		units: config.units,
 		updateInterval: 10 * 60 * 1000, // every 10 minutes
 		animationSpeed: 1000,
 		timeFormat: config.timeFormat,