kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-04 06:46:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #353 from MichMich/develop

Browse Source 
Update to 2.0.2
This commit is contained in:
Michael Teeuw 2016-06-05 12:06:27 +02:00
commit 544a1381fc
25 changed files with 284 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CHANGELOG.md
View File

@ -2,6 +2,20 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## [2.0.2] - 2016-06-05
### Added
- Norwegian Translations (nb and nn)
- Portuguese Translation
- Swedish Translation
### Fixed
- Added reference to Italian Translation.
- Added the missing NE translation to all languages. [#334](https://github.com/MichMich/MagicMirror/issues/344)
- Added proper User-Agent string to calendar call.
### Changed
- Add option to use locationID in weather modules.
## [2.0.1] - 2016-05-18 ## [2.0.1] - 2016-05-18
### Added ### Added
- Changelog - Changelog

2
config/config.js.sample
View File

@ -41,6 +41,7 @@ var config = {
position: 'top_right', position: 'top_right',
config: { config: {
location: 'New York', location: 'New York',
locationID: '', //ID from bulk.openweather.org/sample/
appid: 'YOUR_OPENWEATHER_API_KEY' appid: 'YOUR_OPENWEATHER_API_KEY'
} }
}, },
@ -50,6 +51,7 @@ var config = {
header: 'Weather Forecast', header: 'Weather Forecast',
config: { config: {
location: 'New York', location: 'New York',
locationID: '5128581', //ID from bulk.openweather.org/sample/
appid: 'YOUR_OPENWEATHER_API_KEY' appid: 'YOUR_OPENWEATHER_API_KEY'
} }
}, },

2
js/module.js
View File

@ -152,7 +152,7 @@ var Module = Class.extend({
}, },
/* socket() /* socket()
* Returns a socket object. If it doesn"t exsist, it"s created. * Returns a socket object. If it doesn"t exist, it"s created.
* It also registers the notification callback. * It also registers the notification callback.
*/ */
socket: function() { socket: function() {

2
modules/README.md
View File

@ -298,7 +298,7 @@ If no translation is found, a fallback will be used. The fallback sequence is as
- 4. Translation as defined in core translation file of the fallback language (the first defined core translation file). - 4. Translation as defined in core translation file of the fallback language (the first defined core translation file).
- 5. The key (identifier) of the translation. - 5. The key (identifier) of the translation.
When adding translations to your module, it's a good idea to see if an apropriate translation is already available in the [core translation files](https://github.com/MichMich/MagicMirror/tree/master/translations). This way, your module can benefit from the exsisting translations. When adding translations to your module, it's a good idea to see if an apropriate translation is already available in the [core translation files](https://github.com/MichMich/MagicMirror/tree/master/translations). This way, your module can benefit from the existing translations.
**Example:** **Example:**
````javascript ````javascript

2
modules/default/calendar/calendar.js
View File

@ -49,7 +49,7 @@ Module.register("calendar",{
getTranslations: function() { getTranslations: function() {
// The translations for the defaut modules are defined in the core translation files. // The translations for the defaut modules are defined in the core translation files.
// Therefor we can just return false. Otherwise we should have returned a dictionairy. // Therefor we can just return false. Otherwise we should have returned a dictionairy.
// If you're trying to build yiur own module including translations, check out the documentation. // If you're trying to build your own module including translations, check out the documentation.
return false; return false;
}, },

9
modules/default/calendar/calendarfetcher.js
View File

@ -25,7 +25,12 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
clearTimeout(reloadTimer); clearTimeout(reloadTimer);
reloadTimer = null; reloadTimer = null;
ical.fromURL(url, {}, function(err, data) { var opts = {
headers: {
'User-Agent': 'Mozilla/5.0 (Node.js 6.0.0) MagicMirror/v2 (https://github.com/MichMich/MagicMirror/)'
}
}
ical.fromURL(url, opts, function(err, data) {
if (err) { if (err) {
fetchFailedCallback(self, err); fetchFailedCallback(self, err);
scheduleTimer(); scheduleTimer();
@ -188,7 +193,7 @@ var CalendarFetcher = function(url, reloadInterval, maximumEntries, maximumNumbe
}; };
/* broadcastItems() /* broadcastItems()
* Broadcast the exsisting events. * Broadcast the existing events.
*/ */
this.broadcastEvents = function() { this.broadcastEvents = function() {
//console.log('Broadcasting ' + events.length + ' events.'); //console.log('Broadcasting ' + events.length + ' events.');

6
modules/default/calendar/node_helper.js
View File

@ -30,8 +30,8 @@ module.exports = NodeHelper.create({
}, },
/* createFetcher(url, reloadInterval) /* createFetcher(url, reloadInterval)
* Creates a fetcher for a new url if it doesn't exsist yet. * Creates a fetcher for a new url if it doesn't exist yet.
* Otherwise it reuses the exsisting one. * Otherwise it reuses the existing one.
* *
* attribute url string - URL of the news feed. * attribute url string - URL of the news feed.
* attribute reloadInterval number - Reload interval in milliseconds. * attribute reloadInterval number - Reload interval in milliseconds.
@ -69,7 +69,7 @@ module.exports = NodeHelper.create({
self.fetchers[url] = fetcher; self.fetchers[url] = fetcher;
} else { } else {
//console.log('Use exsisting news fetcher for url: ' + url); //console.log('Use existing news fetcher for url: ' + url);
fetcher = self.fetchers[url]; fetcher = self.fetchers[url];
fetcher.broadcastEvents(); fetcher.broadcastEvents();
} }

8
modules/default/currentweather/README.md
View File

@ -14,6 +14,7 @@ modules: [
config: { config: {
// See 'Configuration options' for more information. // See 'Configuration options' for more information.
location: 'Amsterdam,Netherlands', location: 'Amsterdam,Netherlands',
locationID: '', //Location ID from http://bulk.openweather.org/sample/
appid: 'abcde12345abcde12345abcde12345ab' //openweathermap.org API key. appid: 'abcde12345abcde12345abcde12345ab' //openweathermap.org API key.
} }
} }
@ -42,6 +43,13 @@ The following properties can be configured:
<br><b>Default value:</b> <code>New York</code> <br><b>Default value:</b> <code>New York</code>
</td> </td>
</tr> </tr>
<tr>
<td><code>locationID</code></td>
<td>Location ID from <a href="http://bulk.openweather.org/sample/">OpenWeather</a> <b>This will override anything you put in location.</b><br>Leave blank if you want to use location.
<br><b>Example:</b> <code>1234567</code>
<br><b>Default value:</b> <code></code>
</td>
</tr>
<tr> <tr>
<td><code>appid</code></td> <td><code>appid</code></td>
<td>The <a href="https://home.openweathermap.org" target="_blank">OpenWeatherMap</a> API key, which can be obtained by creating an OpenWeatherMap account.<br> <td>The <a href="https://home.openweathermap.org" target="_blank">OpenWeatherMap</a> API key, which can be obtained by creating an OpenWeatherMap account.<br>

7
modules/default/currentweather/currentweather.js
View File

@ -12,6 +12,7 @@ Module.register("currentweather",{
// Default module config. // Default module config.
defaults: { defaults: {
location: "", location: "",
locationID: "",
appid: "", appid: "",
units: config.units, units: config.units,
updateInterval: 10 * 60 * 1000, // every 10 minutes updateInterval: 10 * 60 * 1000, // every 10 minutes
@ -198,7 +199,11 @@ Module.register("currentweather",{
*/ */
getParams: function() { getParams: function() {
var params = "?"; var params = "?";
params += "q=" + this.config.location; if(this.config.locationID !== "") {
params += "id=" + this.config.locationID;
} else {
params += "q=" + this.config.location;
}
params += "&units=" + this.config.units; params += "&units=" + this.config.units;
params += "&lang=" + this.config.lang; params += "&lang=" + this.config.lang;
params += "&APPID=" + this.config.appid; params += "&APPID=" + this.config.appid;

2
modules/default/newsfeed/fetcher.js
View File

@ -117,7 +117,7 @@ var Fetcher = function(url, reloadInterval, encoding) {
}; };
/* broadcastItems() /* broadcastItems()
* Broadcast the exsisting items. * Broadcast the existing items.
*/ */
this.broadcastItems = function() { this.broadcastItems = function() {
if (items.length <= 0) { if (items.length <= 0) {

6
modules/default/newsfeed/node_helper.js
View File

@ -25,8 +25,8 @@ module.exports = NodeHelper.create({
}, },
/* createFetcher(url, reloadInterval) /* createFetcher(url, reloadInterval)
* Creates a fetcher for a new url if it doesn't exsist yet. * Creates a fetcher for a new url if it doesn't exist yet.
* Otherwise it reoses the exsisting one. * Otherwise it reoses the existing one.
* *
* attribute url string - URL of the news feed. * attribute url string - URL of the news feed.
* attribute reloadInterval number - Reload interval in milliseconds. * attribute reloadInterval number - Reload interval in milliseconds.
@ -62,7 +62,7 @@ module.exports = NodeHelper.create({
self.fetchers[url] = fetcher; self.fetchers[url] = fetcher;
} else { } else {
console.log("Use exsisting news fetcher for url: " + url); console.log("Use existing news fetcher for url: " + url);
fetcher = self.fetchers[url]; fetcher = self.fetchers[url];
fetcher.setReloadInterval(reloadInterval); fetcher.setReloadInterval(reloadInterval);
fetcher.broadcastItems(); fetcher.broadcastItems();

8
modules/default/weatherforecast/README.md
View File

@ -14,6 +14,7 @@ modules: [
config: { config: {
// See 'Configuration options' for more information. // See 'Configuration options' for more information.
location: 'Amsterdam,Netherlands', location: 'Amsterdam,Netherlands',
locationID: '', //Location ID from http://bulk.openweather.org/sample/
appid: 'abcde12345abcde12345abcde12345ab' //openweathermap.org API key. appid: 'abcde12345abcde12345abcde12345ab' //openweathermap.org API key.
} }
} }
@ -42,6 +43,13 @@ The following properties can be configured:
<br><b>Default value:</b> <code>New York</code> <br><b>Default value:</b> <code>New York</code>
</td> </td>
</tr> </tr>
<tr>
<td><code>locationID</code></td>
<td>Location ID from <a href="http://bulk.openweather.org/sample/">OpenWeather</a> <b>This will override anything you put in location.</b><br>Leave blank if you want to use location.
<br><b>Example:</b> <code>1234567</code>
<br><b>Default value:</b> <code></code>
</td>
</tr>
<tr> <tr>
<td><code>appid</code></td> <td><code>appid</code></td>
<td>The <a href="https://home.openweathermap.org" target="_blank">OpenWeatherMap</a> API key, which can be obtained by creating an OpenWeatherMap account.<br> <td>The <a href="https://home.openweathermap.org" target="_blank">OpenWeatherMap</a> API key, which can be obtained by creating an OpenWeatherMap account.<br>

7
modules/default/weatherforecast/weatherforecast.js
View File

@ -12,6 +12,7 @@ Module.register("weatherforecast",{
// Default module config. // Default module config.
defaults: { defaults: {
location: "", location: "",
locationID: "",
appid: "", appid: "",
units: config.units, units: config.units,
maxNumberOfDays: 7, maxNumberOfDays: 7,
@ -195,7 +196,11 @@ Module.register("weatherforecast",{
*/ */
getParams: function() { getParams: function() {
var params = "?"; var params = "?";
params += "q=" + this.config.location; if(this.config.locationID !== "") {
params += "id=" + this.config.locationID;
} else {
params += "q=" + this.config.location;
}
params += "&units=" + this.config.units; params += "&units=" + this.config.units;
params += "&lang=" + this.config.lang; params += "&lang=" + this.config.lang;
/* /*

47
translations/de.json
View File

@ -1,27 +1,28 @@
{ {
/* GENERAL */ /* GENERAL */
"LOADING": "Lade &hellip;", "LOADING": "Lade &hellip;",
/* CALENDAR */ /* CALENDAR */
"TODAY": "Heute", "TODAY": "Heute",
"TOMORROW": "Morgen", "TOMORROW": "Morgen",
"RUNNING": "noch", "RUNNING": "noch",
"EMPTY": "Keine Termine.", "EMPTY": "Keine Termine.",
/* WEATHER */ /* WEATHER */
"N": "N", "N": "N",
"NNE": "NNO", "NNE": "NNO",
"ENE": "ONO", "NE": "NO",
"E": "O", "ENE": "ONO",
"ESE": "OSO", "E": "O",
"SE": "SO", "ESE": "OSO",
"SSE": "SSO", "SE": "SO",
"S": "S", "SSE": "SSO",
"SSW": "SSW", "S": "S",
"SW": "SW", "SSW": "SSW",
"WSW": "WSW", "SW": "SW",
"W": "W", "WSW": "WSW",
"WNW": "WNW", "W": "W",
"NW": "NW", "WNW": "WNW",
"NNW": "NNW" "NW": "NW",
"NNW": "NNW"
} }

47
translations/en.json
View File

@ -1,27 +1,28 @@
{ {
/* GENERAL */ /* GENERAL */
"LOADING": "Loading &hellip;", "LOADING": "Loading &hellip;",
/* CALENDAR */ /* CALENDAR */
"TODAY": "Today", "TODAY": "Today",
"TOMORROW": "Tomorrow", "TOMORROW": "Tomorrow",
"RUNNING": "Ends in", "RUNNING": "Ends in",
"EMPTY": "No upcoming events.", "EMPTY": "No upcoming events.",
/* WEATHER */ /* WEATHER */
"N": "N", "N": "N",
"NNE": "NNE", "NNE": "NNE",
"ENE": "ENE", "NE": "NE",
"E": "E", "ENE": "ENE",
"ESE": "ESE", "E": "E",
"SE": "SE", "ESE": "ESE",
"SSE": "SSE", "SE": "SE",
"S": "S", "SSE": "SSE",
"SSW": "SSW", "S": "S",
"SW": "SW", "SSW": "SSW",
"WSW": "WSW", "SW": "SW",
"W": "W", "WSW": "WSW",
"WNW": "WNW", "W": "W",
"NW": "NW", "WNW": "WNW",
"NNW": "NNW" "NW": "NW",
"NNW": "NNW"
} }

1
translations/es.json
View File

@ -11,6 +11,7 @@
/* WEATHER */ /* WEATHER */
"N": "N", "N": "N",
"NNE": "NNE", "NNE": "NNE",
"NE": "NE",
"ENE": "ENE", "ENE": "ENE",
"E": "E", "E": "E",
"ESE": "ESE", "ESE": "ESE",

47
translations/fr.json
View File

@ -1,27 +1,28 @@
{ {
/* GENERAL */ /* GENERAL */
"LOADING": "Chargement &hellip;", "LOADING": "Chargement &hellip;",
/* CALENDAR */ /* CALENDAR */
"TODAY": "Aujourd'hui", "TODAY": "Aujourd'hui",
"TOMORROW": "Demain", "TOMORROW": "Demain",
"RUNNING": "Se termine dans", "RUNNING": "Se termine dans",
"EMPTY": "Aucun RDV.", "EMPTY": "Aucun RDV.",
/* WEATHER */ /* WEATHER */
"N": "N", "N": "N",
"NNE": "NNE", "NNE": "NNE",
"ENE": "ENE", "NE": "NE",
"E": "E", "ENE": "ENE",
"ESE": "ESE", "E": "E",
"SE": "SE", "ESE": "ESE",
"SSE": "SSE", "SE": "SE",
"S": "S", "SSE": "SSE",
"SSW": "SSO", "S": "S",
"SW": "SO", "SSW": "SSO",
"WSW": "OSO", "SW": "SO",
"W": "O", "WSW": "OSO",
"WNW": "ONO", "W": "O",
"NW": "NO", "WNW": "ONO",
"NNW": "NNO" "NW": "NO",
"NNW": "NNO"
} }

1
translations/fy.json
View File

@ -11,6 +11,7 @@
/* WEATHER */ /* WEATHER */
"N": "N", "N": "N",
"NNE": "NNE", "NNE": "NNE",
"NE": "NE",
"ENE": "ENE", "ENE": "ENE",
"E": "E", "E": "E",
"ESE": "ESE", "ESE": "ESE",

47
translations/it.json
View File

@ -1,27 +1,28 @@
{ {
/* GENERAL */ /* GENERAL */
"LOADING": "Caricamento in corso &hellip;", "LOADING": "Caricamento in corso &hellip;",
/* CALENDAR */ /* CALENDAR */
"TODAY": "Oggi", "TODAY": "Oggi",
"TOMORROW": "Domani", "TOMORROW": "Domani",
"RUNNING": "Termina entro", "RUNNING": "Termina entro",
"EMPTY": "Nessun evento in arrivo.", "EMPTY": "Nessun evento in arrivo.",
/* WEATHER */ /* WEATHER */
"N": "N", "N": "N",
"NNE": "NNE", "NNE": "NNE",
"ENE": "ENE", "NE": "NE",
"E": "E", "ENE": "ENE",
"ESE": "ESE", "E": "E",
"SE": "SE", "ESE": "ESE",
"SSE": "SSE", "SE": "SE",
"S": "S", "SSE": "SSE",
"SSW": "SSW", "S": "S",
"SW": "SW", "SSW": "SSW",
"WSW": "WSW", "SW": "SW",
"W": "W", "WSW": "WSW",
"WNW": "WNW", "W": "W",
"NW": "NW", "WNW": "WNW",
"NNW": "NNW" "NW": "NW",
"NNW": "NNW"
} }

28
translations/nb.json Normal file
View File

@ -0,0 +1,28 @@
{
/* GENERAL */
"LOADING": "Laster &hellip;",
/* CALENDAR */
"TODAY": "I dag",
"TOMORROW": "I morgen",
"RUNNING": "Slutter om",
"EMPTY": "Ingen kommende arrangementer.",
/* WEATHER */
"N": "N",
"NNE": "NNØ",
"NE": "NØ",
"ENE": "ØNØ",
"E": "Ø",
"ESE": "ØSØ",
"SE": "SØ",
"SSE": "SSØ",
"S": "S",
"SSW": "SSV",
"SW": "SV",
"WSW": "VSV",
"W": "V",
"WNW": "VNV",
"NW": "NV",
"NNW": "NNV"
}

1
translations/nl.json
View File

@ -11,6 +11,7 @@
/* WEATHER */ /* WEATHER */
"N": "N", "N": "N",
"NNE": "NNO", "NNE": "NNO",
"NE": "NO",
"ENE": "ONO", "ENE": "ONO",
"E": "O", "E": "O",
"ESE": "OZO", "ESE": "OZO",

28
translations/nn.json Normal file
View File

@ -0,0 +1,28 @@
{
/* GENERAL */
"LOADING": "Lastar &hellip;",
/* CALENDAR */
"TODAY": "I dag",
"TOMORROW": "I morgon",
"RUNNING": "Sluttar om",
"EMPTY": "Ingen komande hendingar.",
/* WEATHER */
"N": "N",
"NNE": "NNA",
"NE": "NA",
"ENE": "ANA",
"E": "A",
"ESE": "ASA",
"SE": "SA",
"SSE": "SSA",
"S": "S",
"SSW": "SSV",
"SW": "SV",
"WSW": "VSV",
"W": "V",
"WNW": "VNV",
"NW": "NV",
"NNW": "NNV"
}

28
translations/pt.json Normal file
View File

@ -0,0 +1,28 @@
{
/* GENERAL */
"LOADING": "A carregar &hellip;",
/* CALENDAR */
"TODAY": "Hoje",
"TOMORROW": "Amanhã",
"RUNNING": "Termina em",
"EMPTY": "Sem eventos a chegar.",
/* WEATHER */
"N": "N",
"NNE": "NNE",
"NE": "NE",
"ENE": "ENE",
"E": "E",
"ESE": "ESE",
"SE": "SE",
"SSE": "SSE",
"S": "S",
"SSW": "SSO",
"SW": "SO",
"WSW": "OSO",
"W": "O",
"WNW": "ONO",
"NW": "NO",
"NNW": "NNO"
}

28
translations/sv.json Normal file
View File

@ -0,0 +1,28 @@
{
/* GENERAL */
"LOADING": "Laddar &hellip;",
/* CALENDAR */
"TODAY": "Idag",
"TOMORROW": "Imorgon",
"RUNNING": "Slutar",
"EMPTY": "Inga kommande händelser.",
/* WEATHER */
"N": "N",
"NNE": "NNO",
"NE": "NO",
"ENE": "ONO",
"E": "Ö",
"ESE": "OSO",
"SE": "SO",
"SSE": "SSO",
"S": "S",
"SSW": "SSV",
"SW": "SV",
"WSW": "VSV",
"W": "V",
"WNW": "VNV",
"NW": "NV",
"NNW": "NNV"
}

18
translations/translations.js
View File

@ -6,11 +6,15 @@
*/ */
var translations = { var translations = {
"en" : "translations/en.json", "en" : "translations/en.json", // English
"nl" : "translations/nl.json", "nl" : "translations/nl.json", // Dutch
"de" : "translations/de.json", "de" : "translations/de.json", // German
"fr" : "translations/fr.json", "fr" : "translations/fr.json", // French
"fy" : "translations/fy.json", "fy" : "translations/fy.json", // Frysk
"es" : "translations/es.json", "es" : "translations/es.json", // Spanish
"it" : "translations/it.json", "nb" : "translations/nb.json", // Norsk bokmål
"nn" : "translations/nn.json", // Norsk nynorsk
"pt" : "translations/pt.json", // Português
"sv" : "translations/sv.json", // Svenska
"it" : "translations/it.json", // Italian
}; };