From 0d3c03d1e30c66d254cf8871be2e926fae84413a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Fri, 17 Mar 2017 22:36:09 -0300 Subject: [PATCH] Restore code removed on Merges on 2017-03-17 --- CHANGELOG.md | 1 + js/app.js | 4 +--- js/main.js | 5 ++++- modules/default/calendar/README.md | 2 +- translations/id.json | 30 ++++++++++++++++++++++++++++++ translations/nb.json | 7 ++++++- translations/nn.json | 7 ++++++- translations/translations.js | 1 + 8 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 translations/id.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ed16095..7fe62971 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,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/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); } }; diff --git a/js/main.js b/js/main.js index e1a13d8a..8c64d880 100644 --- a/js/main.js +++ b/js/main.js @@ -245,10 +245,13 @@ 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(); + // Waiting for DOM-changes done in updateWrapperStates before we can start the animation. + var dummy = moduleWrapper.parentElement.parentElement.offsetHeight; + moduleWrapper.style.opacity = 1; + clearTimeout(module.showHideTimer); module.showHideTimer = setTimeout(function() { if (typeof callback === "function") { callback(); } diff --git a/modules/default/calendar/README.md b/modules/default/calendar/README.md index a0fe3a30..470560ba 100644 --- a/modules/default/calendar/README.md +++ b/modules/default/calendar/README.md @@ -54,7 +54,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', diff --git a/translations/id.json b/translations/id.json new file mode 100644 index 00000000..a311f960 --- /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/nb.json b/translations/nb.json index 1b57a5fa..9a3060be 100644 --- 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 index 107bec9d..ebe4cee7 100644 --- 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." } diff --git a/translations/translations.js b/translations/translations.js index 0d12a604..61701ab9 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