From f5595dd4c3d34baa43144276a6569f90a60e9253 Mon Sep 17 00:00:00 2001 From: slametps Date: Fri, 17 Feb 2017 13:45:29 +0700 Subject: [PATCH 01/11] added Indonesian translation added Indonesian translation --- translations/id.json | 30 ++++++++++++++++++++++++++++++ translations/translations.js | 1 + 2 files changed, 31 insertions(+) create mode 100644 translations/id.json diff --git a/translations/id.json b/translations/id.json new file mode 100644 index 00000000..f144e959 --- /dev/null +++ b/translations/id.json @@ -0,0 +1,30 @@ +{ + "LOADING": "Memuat …", + + "TODAY": "Hari ini", + "TOMORROW": "Besok", + "DAYAFTERTOMORROW": "Lusa", + "RUNNING": "Berakhir dalam", + "EMPTY": "Tidak ada agenda.", + + "N": "U", + "NNE": "UUT", + "NE": "NE", + "ENE": "TUT", + "E": "T", + "ESE": "TST", + "SE": "ST", + "SSE": "SST", + "S": "S", + "SSW": "SSB", + "SW": "SB", + "WSW": "BSB", + "W": "B", + "WNW": "BUB", + "NW": "UB", + "NNW": "UUB", + + "UPDATE_NOTIFICATION": "Update MagicMirror² tersedia.", + "UPDATE_NOTIFICATION_MODULE": "Update tersedia untuk modul MODULE_NAME.", + "UPDATE_INFO": "Instalasi saat ini tertinggal COMMIT_COUNT pada cabang BRANCH_NAME." +} diff --git a/translations/translations.js b/translations/translations.js index 0d12a604..8441ed8e 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -18,6 +18,7 @@ var translations = { "pt" : "translations/pt.json", // Português "pt_br" : "translations/pt_br.json", // Português Brasileiro "sv" : "translations/sv.json", // Svenska + "id" : "translations/id.json", // Indonesian "it" : "translations/it.json", // Italian "zh_cn" : "translations/zh_cn.json", // Simplified Chinese "zh_tw" : "translations/zh_tw.json", // Traditional Chinese From 692ddc60c7ce5b1121bf802ee1b7bb949f62d8a3 Mon Sep 17 00:00:00 2001 From: slametps Date: Sun, 19 Feb 2017 22:23:16 +0700 Subject: [PATCH 02/11] remove period remove period --- translations/id.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/id.json b/translations/id.json index f144e959..a311f960 100644 --- a/translations/id.json +++ b/translations/id.json @@ -5,7 +5,7 @@ "TOMORROW": "Besok", "DAYAFTERTOMORROW": "Lusa", "RUNNING": "Berakhir dalam", - "EMPTY": "Tidak ada agenda.", + "EMPTY": "Tidak ada agenda", "N": "U", "NNE": "UUT", From 1027efd6e5b96719323bf8414df6c003e725f149 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Sun, 5 Mar 2017 19:50:48 +0100 Subject: [PATCH 03/11] small fixes in hu translation --- translations/hu.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/hu.json b/translations/hu.json index de18d82e..4723fe9a 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -24,7 +24,7 @@ "NW": "ÉNy", "NNW": "ÉÉNy", - "UPDATE_NOTIFICATION": "MagicMirror² elérhető egy frissítés!", - "UPDATE_NOTIFICATION_MODULE": "A frissítés MODULE_NAME modul néven érhető el.", - "UPDATE_INFO": "A jelenlegi telepítés COMMIT_COUNT mögött BRANCH_NAME ágon található." + "UPDATE_NOTIFICATION": "Elérhető MagicMirror² frissítés.", + "UPDATE_NOTIFICATION_MODULE": "Frissítés érhető el a MODULE_NAME modulhoz.", + "UPDATE_INFO": "A jelenlegi telepített verzió COMMIT_COUNT commit-al régebbi a BRANCH_NAME branch-en." } From c2e90864ac21d4405bb7c37cd3253c59e8e67940 Mon Sep 17 00:00:00 2001 From: Cato Antonsen Date: Sun, 5 Mar 2017 22:23:05 +0100 Subject: [PATCH 04/11] Fixed missing animations on this.show() when module is alone in a region --- CHANGELOG.md | 1 + js/main.js | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) mode change 100644 => 100755 CHANGELOG.md mode change 100644 => 100755 js/main.js diff --git a/CHANGELOG.md b/CHANGELOG.md old mode 100644 new mode 100755 index 1138da27..d3918091 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Module currentWeather: check if temperature received from api is defined. - Fix an issue with module hidden status changing to `true` although lock string prevented showing it - Fix newsfeed module bug (removeStartTags) +- Fixed missing animation on `this.show(speed)` when module is alone in a region. ## [2.1.0] - 2016-12-31 diff --git a/js/main.js b/js/main.js old mode 100644 new mode 100755 index e1a13d8a..a81e3530 --- a/js/main.js +++ b/js/main.js @@ -245,15 +245,20 @@ var MM = (function() { moduleWrapper.style.transition = "opacity " + speed / 1000 + "s"; // Restore the postition. See hideModule() for more info. moduleWrapper.style.position = "static"; - moduleWrapper.style.opacity = 1; - + updateWrapperStates(); - clearTimeout(module.showHideTimer); - module.showHideTimer = setTimeout(function() { - if (typeof callback === "function") { callback(); } - }, speed); + // Waiting for DOM-changes done in updateWrapperStates before we can start the animation. + setTimeout(function(){ + moduleWrapper.style.opacity = 1; + + + clearTimeout(module.showHideTimer); + module.showHideTimer = setTimeout(function() { + if (typeof callback === "function") { callback(); } + }, speed); + }, 0); } }; From 347a2977fad56891750431856df877377c562e51 Mon Sep 17 00:00:00 2001 From: Cato Antonsen Date: Sun, 5 Mar 2017 22:46:48 +0100 Subject: [PATCH 05/11] Removed trailing spaces --- js/main.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/main.js b/js/main.js index a81e3530..57f9ac25 100755 --- a/js/main.js +++ b/js/main.js @@ -245,15 +245,13 @@ var MM = (function() { moduleWrapper.style.transition = "opacity " + speed / 1000 + "s"; // Restore the postition. See hideModule() for more info. moduleWrapper.style.position = "static"; - + updateWrapperStates(); // Waiting for DOM-changes done in updateWrapperStates before we can start the animation. setTimeout(function(){ moduleWrapper.style.opacity = 1; - - clearTimeout(module.showHideTimer); module.showHideTimer = setTimeout(function() { if (typeof callback === "function") { callback(); } From 120b50536167ac59b3f5d2c779ad0d065d324f94 Mon Sep 17 00:00:00 2001 From: Cato Antonsen Date: Sun, 5 Mar 2017 23:36:24 +0100 Subject: [PATCH 06/11] Implemented another way of waiting for refresh of region before animation --- js/main.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/js/main.js b/js/main.js index 57f9ac25..4aa64a79 100755 --- a/js/main.js +++ b/js/main.js @@ -249,14 +249,14 @@ var MM = (function() { updateWrapperStates(); // Waiting for DOM-changes done in updateWrapperStates before we can start the animation. - setTimeout(function(){ - moduleWrapper.style.opacity = 1; + var dummy = moduleWrapper.parentElement.parentElement.offsetHeight; + + moduleWrapper.style.opacity = 1; - clearTimeout(module.showHideTimer); - module.showHideTimer = setTimeout(function() { - if (typeof callback === "function") { callback(); } - }, speed); - }, 0); + clearTimeout(module.showHideTimer); + module.showHideTimer = setTimeout(function() { + if (typeof callback === "function") { callback(); } + }, speed); } }; From 219021873df330ea418031b95a06754cd944fe70 Mon Sep 17 00:00:00 2001 From: Cato Antonsen Date: Sun, 5 Mar 2017 23:42:13 +0100 Subject: [PATCH 07/11] Removed trailing space --- js/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/main.js b/js/main.js index 4aa64a79..ad1486ca 100755 --- a/js/main.js +++ b/js/main.js @@ -249,8 +249,8 @@ var MM = (function() { updateWrapperStates(); // Waiting for DOM-changes done in updateWrapperStates before we can start the animation. - var dummy = moduleWrapper.parentElement.parentElement.offsetHeight; - + var dummy = moduleWrapper.parentElement.parentElement.offsetHeight; + moduleWrapper.style.opacity = 1; clearTimeout(module.showHideTimer); From 21688383659b902e7e9fee22fb812ffb52f4a4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sun, 5 Mar 2017 22:05:54 -0300 Subject: [PATCH 08/11] Use just one callback statement in case of failure on loader of the configuration file. --- js/app.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/app.js b/js/app.js index 6c1f6ea2..f8825f7e 100644 --- a/js/app.js +++ b/js/app.js @@ -69,14 +69,12 @@ var App = function() { } catch (e) { if (e.code == "ENOENT") { console.error("WARNING! Could not find config file. Please create one. Starting with default configuration."); - callback(defaults); } else if (e instanceof ReferenceError || e instanceof SyntaxError) { console.error("WARNING! Could not validate config file. Please correct syntax errors. Starting with default configuration."); - callback(defaults); } else { console.error("WARNING! Could not load config file. Starting with default configuration. Error found: " + e); - callback(defaults); } + callback(defaults); } }; From d97571ce0c322779f3cac1c98e2030e75c80103b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 6 Mar 2017 02:11:27 -0300 Subject: [PATCH 09/11] Fix tab documentacion calendar for colored option --- modules/default/calendar/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/calendar/README.md b/modules/default/calendar/README.md index 57a989a8..bc2e9771 100644 --- a/modules/default/calendar/README.md +++ b/modules/default/calendar/README.md @@ -53,7 +53,7 @@ The `colored` property gives the option for an individual color for each calenda #### Default value: ````javascript config: { - colored: false, + colored: false, calendars: [ { url: 'http://www.calendarlabs.com/templates/ical/US-Holidays.ics', From a3836b5e171ec6c3b81619485bf49c4a030f3984 Mon Sep 17 00:00:00 2001 From: Cato Antonsen Date: Tue, 7 Mar 2017 18:06:26 +0100 Subject: [PATCH 10/11] Updated Norwegian translations (nn and nb) --- CHANGELOG.md | 2 +- translations/nb.json | 7 ++++++- translations/nn.json | 7 ++++++- 3 files changed, 13 insertions(+), 3 deletions(-) mode change 100644 => 100755 CHANGELOG.md mode change 100644 => 100755 translations/nb.json mode change 100644 => 100755 translations/nn.json diff --git a/CHANGELOG.md b/CHANGELOG.md old mode 100644 new mode 100755 index 1138da27..69b00ff6 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,7 +48,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test for compliments module for parts of day - Korean Translation. - Added console warning on startup when deprecated config options are used - +- Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION`, `UPDATE_NOTIFICATION_MODULE`, `UPDATE_INFO` to Norwegian translations (`nn` and `nb`). ### Fixed - Update .gitignore to not ignore default modules folder. diff --git a/translations/nb.json b/translations/nb.json old mode 100644 new mode 100755 index 1b57a5fa..9a3060be --- a/translations/nb.json +++ b/translations/nb.json @@ -3,6 +3,7 @@ "TODAY": "I dag", "TOMORROW": "I morgen", + "DAYAFTERTOMORROW": "I overmorgen", "RUNNING": "Slutter om", "EMPTY": "Ingen kommende arrangementer.", @@ -21,5 +22,9 @@ "W": "V", "WNW": "VNV", "NW": "NV", - "NNW": "NNV" + "NNW": "NNV", + + "UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengelig.", + "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen MODULE_NAME.", + "UPDATE_INFO": "Nåværende installasjon er COMMIT_COUNT bak BRANCH_NAME grenen." } diff --git a/translations/nn.json b/translations/nn.json old mode 100644 new mode 100755 index 107bec9d..ebe4cee7 --- a/translations/nn.json +++ b/translations/nn.json @@ -3,6 +3,7 @@ "TODAY": "I dag", "TOMORROW": "I morgon", + "DAYAFTERTOMORROW": "I overmorgon", "RUNNING": "Sluttar om", "EMPTY": "Ingen komande hendingar.", @@ -21,5 +22,9 @@ "W": "V", "WNW": "VNV", "NW": "NV", - "NNW": "NNV" + "NNW": "NNV", + + "UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.", + "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen MODULE_NAME.", + "UPDATE_INFO": "noverande installasjon er COMMIT_COUNT bak BRANCH_NAME greinen." } From db1022600570f238749e1017fe4876e85775b9de Mon Sep 17 00:00:00 2001 From: Slamet PS Date: Wed, 8 Mar 2017 10:37:27 +0700 Subject: [PATCH 11/11] update spaces to tab --- translations/translations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/translations.js b/translations/translations.js index 8441ed8e..61701ab9 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -18,7 +18,7 @@ var translations = { "pt" : "translations/pt.json", // Português "pt_br" : "translations/pt_br.json", // Português Brasileiro "sv" : "translations/sv.json", // Svenska - "id" : "translations/id.json", // Indonesian + "id" : "translations/id.json", // Indonesian "it" : "translations/it.json", // Italian "zh_cn" : "translations/zh_cn.json", // Simplified Chinese "zh_tw" : "translations/zh_tw.json", // Traditional Chinese