From 13305d111e3916024e14a5d1f18727f866ca6e65 Mon Sep 17 00:00:00 2001 From: "Ashley M. Kirchner" Date: Wed, 20 Jul 2016 13:31:46 -0600 Subject: [PATCH 1/8] Ability ot turn off date view on analog clock & small grammer error fix in module.js --- CHANGELOG.md | 2 ++ js/module.js | 2 +- modules/default/clock/README.md | 7 +++++++ modules/default/clock/clock.js | 14 +++++++++++--- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d48a7faf..f1abd8a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Prevent `getModules()` selectors from returning duplicate entries. - Append endpoints of weather modules with `/` to retreive the correct data. (Issue [#337](https://github.com/MichMich/MagicMirror/issues/337)) +- Corrected grammer in `module.js` from 'suspend' to 'suspended'. +- Added ability to turn off the date display in `clock.js` when in analog mode. ## [2.0.3] - 2016-07-12 ### Added diff --git a/js/module.js b/js/module.js index 9ee13e4c..6f7f9686 100644 --- a/js/module.js +++ b/js/module.js @@ -114,7 +114,7 @@ var Module = Class.extend({ * This method is called when a module is hidden. */ suspend: function() { - Log.log(this.name + " is suspend."); + Log.log(this.name + " is suspended."); }, /* resume() diff --git a/modules/default/clock/README.md b/modules/default/clock/README.md index 77eb3fde..c7ec6bcb 100644 --- a/modules/default/clock/README.md +++ b/modules/default/clock/README.md @@ -101,5 +101,12 @@ The following properties can be configured:
Default value: bottom + + analogShowDate + Specific to the analog clock. If the clock is used as a separate module and set to analog only, this configures whether a date is also displayed with the clock.
+
Possible values: false, top, or bottom +
Default value: top + + diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js index 9f4abecb..e3415375 100644 --- a/modules/default/clock/clock.js +++ b/modules/default/clock/clock.js @@ -19,7 +19,8 @@ Module.register("clock",{ /* specific to the analog clock */ analogSize: '200px', analogFace: 'simple', // options: 'none', 'simple', 'face-###' (where ### is 001 to 012 inclusive) - analogPlacement: 'bottom', // options: top, bottom, left, right + analogPlacement: 'bottom', // options: 'top', 'bottom', 'left', 'right' + analogShowDate: 'top', // options: false, 'top', or 'bottom' secondsColor: '#888888', }, // Define required scripts. @@ -170,8 +171,15 @@ Module.register("clock",{ // Display only an analog clock dateWrapper.style.textAlign = "center"; dateWrapper.style.paddingBottom = "15px"; - wrapper.appendChild(dateWrapper); - wrapper.appendChild(clockCircle); + if (this.config.analogShowDate === 'top') { + wrapper.appendChild(dateWrapper); + wrapper.appendChild(clockCircle); + } else if (this.config.analogShowDate === 'bottom') { + wrapper.appendChild(clockCircle); + wrapper.appendChild(dateWrapper); + } else { + wrapper.appendChild(clockCircle); + } } else { // Both clocks have been configured, check position var placement = this.config.analogPlacement; From a8b2ca7cfef9439cbfaffd002bfb98123f92c365 Mon Sep 17 00:00:00 2001 From: Dimitrios Kapsalis Date: Thu, 21 Jul 2016 13:42:48 -0500 Subject: [PATCH 2/8] Added Greek translation --- translations/translations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/translations.js b/translations/translations.js index 1f541c45..c7e40357 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -21,5 +21,5 @@ var translations = { "zh_tw" : "translations/zh_tw.json", // Traditional Chinese "ja" : "translations/ja.json", // Japanese "pl" : "translations/pl.json", // Polish - + "gr" : "translations/gr.json", // Greek }; From a7a0350c1ab542a3ea9afdecef6f0de8ee854932 Mon Sep 17 00:00:00 2001 From: Dimitrios Kapsalis Date: Thu, 21 Jul 2016 13:45:14 -0500 Subject: [PATCH 3/8] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1abd8a4..b3706195 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Append endpoints of weather modules with `/` to retreive the correct data. (Issue [#337](https://github.com/MichMich/MagicMirror/issues/337)) - Corrected grammer in `module.js` from 'suspend' to 'suspended'. - Added ability to turn off the date display in `clock.js` when in analog mode. +- Greek Translation ## [2.0.3] - 2016-07-12 ### Added From 754fe3df91968c38bdd3a4ec9a0d54285fe0f9a8 Mon Sep 17 00:00:00 2001 From: Dimitrios Kapsalis Date: Sat, 23 Jul 2016 10:35:14 -0500 Subject: [PATCH 4/8] Greek Translation --- translations/gr.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 translations/gr.json diff --git a/translations/gr.json b/translations/gr.json new file mode 100644 index 00000000..6b9c92ac --- /dev/null +++ b/translations/gr.json @@ -0,0 +1,28 @@ +{ + /* GENERAL */ + "LOADING": "Φόρτωση …", + + /* CALENDAR */ + "TODAY": "Σήμερα", + "TOMORROW": "Αύριο", + "RUNNING": "Λήγει σε", + "EMPTY": "Δεν υπάρχουν προσεχείς εκδηλώσεις.", + + /* WEATHER */ + "N": "B", + "NNE": "BBA", + "NE": "BA", + "ENE": "ABA", + "E": "A", + "ESE": "ANA", + "SE": "NA", + "SSE": "NNA", + "S": "N", + "SSW": "NNΔ", + "SW": "NΔ", + "WSW": "ΔNΔ", + "W": "Δ", + "WNW": "ΔΒΔ", + "NW": "ΒΔ", + "NNW": "ΒΒΔ" +} From 52724623681aa4d158072505fb77895eee9e7e75 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 23 Jul 2016 17:43:37 +0200 Subject: [PATCH 5/8] Add header --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3706195..786391d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Prevent `getModules()` selectors from returning duplicate entries. - Append endpoints of weather modules with `/` to retreive the correct data. (Issue [#337](https://github.com/MichMich/MagicMirror/issues/337)) - Corrected grammer in `module.js` from 'suspend' to 'suspended'. + +### Added - Added ability to turn off the date display in `clock.js` when in analog mode. - Greek Translation From ce2c163f4b155fd9c1388a3b5cffcda88d09952e Mon Sep 17 00:00:00 2001 From: Diego Vieira Date: Mon, 25 Jul 2016 16:11:01 -0300 Subject: [PATCH 6/8] brazilian portuguese translation --- translations/pt_br.json | 28 ++++++++++++++++++++++++++++ translations/translations.js | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 translations/pt_br.json diff --git a/translations/pt_br.json b/translations/pt_br.json new file mode 100644 index 00000000..57bb4314 --- /dev/null +++ b/translations/pt_br.json @@ -0,0 +1,28 @@ +{ + /* GENERAL */ + "LOADING": "Carregando …", + + /* CALENDAR */ + "TODAY": "Hoje", + "TOMORROW": "Amanhã", + "RUNNING": "Acaba em", + "EMPTY": "Nenhum evento novo.", + + /* 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" +} diff --git a/translations/translations.js b/translations/translations.js index c7e40357..51665d70 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -15,11 +15,12 @@ var translations = { "nb" : "translations/nb.json", // Norsk bokmål "nn" : "translations/nn.json", // Norsk nynorsk "pt" : "translations/pt.json", // Português + "pt_br" : "translations/pt_br.json", // Português Brasileiro "sv" : "translations/sv.json", // Svenska "it" : "translations/it.json", // Italian "zh_cn" : "translations/zh_cn.json", // Simplified Chinese "zh_tw" : "translations/zh_tw.json", // Traditional Chinese "ja" : "translations/ja.json", // Japanese "pl" : "translations/pl.json", // Polish - "gr" : "translations/gr.json", // Greek + }; From d7be56df7aa5067da40a00857bd43cb270e7ee3b Mon Sep 17 00:00:00 2001 From: Diego Vieira Date: Mon, 25 Jul 2016 16:12:28 -0300 Subject: [PATCH 7/8] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 786391d1..24123812 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## Unpublished +### Added +- Brazilian Portuguese Translation + ### Fixed - Prevent `getModules()` selectors from returning duplicate entries. - Append endpoints of weather modules with `/` to retreive the correct data. (Issue [#337](https://github.com/MichMich/MagicMirror/issues/337)) From 28ca8a9f9ffe397d778df3ebb9f6d999b0cba170 Mon Sep 17 00:00:00 2001 From: Diego Vieira Date: Tue, 26 Jul 2016 07:31:31 -0300 Subject: [PATCH 8/8] added Greek translation back --- translations/translations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/translations.js b/translations/translations.js index 51665d70..2a458ef2 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -22,5 +22,5 @@ var translations = { "zh_tw" : "translations/zh_tw.json", // Traditional Chinese "ja" : "translations/ja.json", // Japanese "pl" : "translations/pl.json", // Polish - + "gr" : "translations/gr.json", // Greek };