From 1b69e62e2e25497959614bb3e0d83b5af05659ce Mon Sep 17 00:00:00 2001 From: Jens Date: Wed, 31 Aug 2016 14:39:37 +0200 Subject: [PATCH 1/9] Added "DAYAFTERTOMORROW" tag if config language is German --- modules/default/calendar/calendar.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index c90153a0..cf2c97cb 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -150,6 +150,12 @@ Module.register("calendar",{ timeWrapper.innerHTML = this.translate("TODAY"); } else if (event.startDate - now < one_day && event.startDate - now > 0) { timeWrapper.innerHTML = this.translate("TOMORROW"); + } else if (event.startDate - now < 2*one_day && event.startDate - now > 0) { + if (config.language == 'de') { + timeWrapper.innerHTML = this.translate("DAYAFTERTOMORROW"); + } else { + timeWrapper.innerHTML = moment(event.startDate, "x").fromNow(); + } } else { /* Check to see if the user displays absolute or relative dates with their events * Also check to see if an event is happening within an 'urgency' time frameElement From 76d6dca63fdafea8128bfa9d9d91b3da655ef183 Mon Sep 17 00:00:00 2001 From: Jens Date: Wed, 31 Aug 2016 14:41:49 +0200 Subject: [PATCH 2/9] =?UTF-8?q?Added=20"=C3=9Cbermorgen"=20to=20show=20in?= =?UTF-8?q?=20calendar.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- translations/de.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/de.json b/translations/de.json index d4c20d10..d8a254a9 100644 --- a/translations/de.json +++ b/translations/de.json @@ -5,6 +5,7 @@ /* CALENDAR */ "TODAY": "Heute", "TOMORROW": "Morgen", + "DAYAFTERTOMORROW": "Übermorgen", "RUNNING": "noch", "EMPTY": "Keine Termine.", From f5be159187e63f11dc3a879aeaaf6a9091794b76 Mon Sep 17 00:00:00 2001 From: Jens Date: Wed, 31 Aug 2016 22:11:31 +0200 Subject: [PATCH 3/9] Added "DAYAFTERTOMORROW" tag if available --- modules/default/calendar/calendar.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index cf2c97cb..d4871338 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -151,10 +151,14 @@ Module.register("calendar",{ } else if (event.startDate - now < one_day && event.startDate - now > 0) { timeWrapper.innerHTML = this.translate("TOMORROW"); } else if (event.startDate - now < 2*one_day && event.startDate - now > 0) { - if (config.language == 'de') { - timeWrapper.innerHTML = this.translate("DAYAFTERTOMORROW"); + /*Provide ability to show "the day after tomorrow" instead of "in a day" + *if "DAYAFTERTOMORROW" is configured in a language's translation .json file, + *,which can be found in MagicMirror/translations/ + */ + if (this.translate('DAYAFTERTOMORROW') !== 'DAYAFTERTOMORROW') { + timeWrapper.innerHTML = this.translate("DAYAFTERTOMORROW"); } else { - timeWrapper.innerHTML = moment(event.startDate, "x").fromNow(); + timeWrapper.innerHTML = moment(event.startDate, "x").fromNow(); } } else { /* Check to see if the user displays absolute or relative dates with their events From 88266ec4e302fcbdce43b5f770e411dc2b2e8d7e Mon Sep 17 00:00:00 2001 From: Jens Date: Wed, 31 Aug 2016 22:17:43 +0200 Subject: [PATCH 4/9] Added "day after tomorrow" changes to calendar.js --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c76d0362..e9e14d7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## Unpublished + +### Updated +- Force fullscreen when kioskmode is active. + +### Added +- Added ability to remove tags from the beginning or end of newsfeed items in 'newsfeed.js' +- Added ability to define "the day after tomorrow" for calendar events (Definition for German already included) + ## [2.0.4] - 2016-08-07 ### Added From 104c1ecbec9815d87d1b9740dfbe3b35bd9544d7 Mon Sep 17 00:00:00 2001 From: Jens Date: Wed, 31 Aug 2016 22:18:30 +0200 Subject: [PATCH 5/9] Added "day after tomorrow" changes to calendar.js --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9e14d7b..661eda5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Force fullscreen when kioskmode is active. ### Added -- Added ability to remove tags from the beginning or end of newsfeed items in 'newsfeed.js' -- Added ability to define "the day after tomorrow" for calendar events (Definition for German already included) +- Added ability to remove tags from the beginning or end of newsfeed items in 'newsfeed.js'. +- Added ability to define "the day after tomorrow" for calendar events (Definition for German already included). ## [2.0.4] - 2016-08-07 From 3d97e26cde73e7bc6d0a1fa6317842c6cbe485fe Mon Sep 17 00:00:00 2001 From: Jens Date: Wed, 31 Aug 2016 22:40:50 +0200 Subject: [PATCH 6/9] Delete CHANGELOG.md --- CHANGELOG.md | 83 ---------------------------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 661eda5f..00000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,83 +0,0 @@ -# MagicMirror² Change Log -All notable changes to this project will be documented in this file. -This project adheres to [Semantic Versioning](http://semver.org/). - -## Unpublished - -### Updated -- Force fullscreen when kioskmode is active. - -### Added -- Added ability to remove tags from the beginning or end of newsfeed items in 'newsfeed.js'. -- Added ability to define "the day after tomorrow" for calendar events (Definition for German already included). - -## [2.0.4] - 2016-08-07 - -### Added -- Brazilian Portuguese Translation. -- Option to enable Kios mode. -- Added ability to start the app with Dev Tools. -- Added ability to turn off the date display in `clock.js` when in analog mode. -- Greek 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)) -- Corrected grammer in `module.js` from 'suspend' to 'suspended'. -- Fixed openweathermap.org URL in config sample. -- Prevent currentweather module from crashing when received data object is incorrect. -- Fix issue where translation loading prevented the UI start-up when the language was set to 'en'. (Issue [#388](https://github.com/MichMich/MagicMirror/issues/388)) - -### Updated -- Updated package.json to fix possible vulnerabilities. (Using Snyk) -- Updated weathericons -- Updated default weatherforecast to work with the new icons. -- More detailed error message in case config file couldn't be loaded. - -## [2.0.3] - 2016-07-12 -### Added -- Add max newsitems parameter to the newsfeed module. -- Translations for Simplified Chinese, Traditional Chinese and Japanese. -- Polish Translation -- Add an analog clock in addition to the digital one. - -### Fixed -- Edit Alert Module to display title & message if they are provided in the notification (Issue [#300](https://github.com/MichMich/MagicMirror/issues/300)) -- Removed 'null' reference from updateModuleContent(). This fixes recent Edge and Internet Explorer browser displays (Issue [#319](https://github.com/MichMich/MagicMirror/issues/319)) - -### Changed -- Added default string to calendar titleReplace. - -## [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 -### Added -- Changelog -- Italian Translation - -### Changed -- Improve the installer by fetching the latest Node.js without any 3rd party interferences. - -## [2.0.0] - 2016-05-03 -### Initial release of MagicMirror² -It includes (but is not limited to) the following features: -- Modular system allowing 3rd party plugins. -- An Node/Electron based application taking away the need for external servers or browsers. -- A complete development API documentation. -- Small cute fairies that kiss you while you sleep. - -## [1.0.0] - 2014-02-16 -### Initial release of MagicMirror. -This was part of the blogpost: http://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the From 91dd308952308aeeaad7b4fe66dbf0b94e5b139e Mon Sep 17 00:00:00 2001 From: yo-less Date: Wed, 31 Aug 2016 22:43:27 +0200 Subject: [PATCH 7/9] Added 'day after tomorrow' changes to calendar.js --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 661eda5f..64afe07c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## Unpublished ### Updated -- Force fullscreen when kioskmode is active. +- Force fullscreen when kioskmode is active. ### Added - Added ability to remove tags from the beginning or end of newsfeed items in 'newsfeed.js'. From 1bba75881f396873dd00274c4b5a7e78272e90bb Mon Sep 17 00:00:00 2001 From: yo-less Date: Wed, 31 Aug 2016 22:46:54 +0200 Subject: [PATCH 8/9] Added 'day after tomorrow'changes to calendar.js --- CHANGELOG.md | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..64afe07c --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,83 @@ +# MagicMirror² Change Log +All notable changes to this project will be documented in this file. +This project adheres to [Semantic Versioning](http://semver.org/). + +## Unpublished + +### Updated +- Force fullscreen when kioskmode is active. + +### Added +- Added ability to remove tags from the beginning or end of newsfeed items in 'newsfeed.js'. +- Added ability to define "the day after tomorrow" for calendar events (Definition for German already included). + +## [2.0.4] - 2016-08-07 + +### Added +- Brazilian Portuguese Translation. +- Option to enable Kios mode. +- Added ability to start the app with Dev Tools. +- Added ability to turn off the date display in `clock.js` when in analog mode. +- Greek 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)) +- Corrected grammer in `module.js` from 'suspend' to 'suspended'. +- Fixed openweathermap.org URL in config sample. +- Prevent currentweather module from crashing when received data object is incorrect. +- Fix issue where translation loading prevented the UI start-up when the language was set to 'en'. (Issue [#388](https://github.com/MichMich/MagicMirror/issues/388)) + +### Updated +- Updated package.json to fix possible vulnerabilities. (Using Snyk) +- Updated weathericons +- Updated default weatherforecast to work with the new icons. +- More detailed error message in case config file couldn't be loaded. + +## [2.0.3] - 2016-07-12 +### Added +- Add max newsitems parameter to the newsfeed module. +- Translations for Simplified Chinese, Traditional Chinese and Japanese. +- Polish Translation +- Add an analog clock in addition to the digital one. + +### Fixed +- Edit Alert Module to display title & message if they are provided in the notification (Issue [#300](https://github.com/MichMich/MagicMirror/issues/300)) +- Removed 'null' reference from updateModuleContent(). This fixes recent Edge and Internet Explorer browser displays (Issue [#319](https://github.com/MichMich/MagicMirror/issues/319)) + +### Changed +- Added default string to calendar titleReplace. + +## [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 +### Added +- Changelog +- Italian Translation + +### Changed +- Improve the installer by fetching the latest Node.js without any 3rd party interferences. + +## [2.0.0] - 2016-05-03 +### Initial release of MagicMirror² +It includes (but is not limited to) the following features: +- Modular system allowing 3rd party plugins. +- An Node/Electron based application taking away the need for external servers or browsers. +- A complete development API documentation. +- Small cute fairies that kiss you while you sleep. + +## [1.0.0] - 2014-02-16 +### Initial release of MagicMirror. +This was part of the blogpost: http://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the From f795ee7fd90cd7b31392ed36366321d7e9a21aa7 Mon Sep 17 00:00:00 2001 From: yo-less Date: Wed, 31 Aug 2016 22:46:54 +0200 Subject: [PATCH 9/9] Added "day after tomorrow" changes to calendar.js --- CHANGELOG.md | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..64afe07c --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,83 @@ +# MagicMirror² Change Log +All notable changes to this project will be documented in this file. +This project adheres to [Semantic Versioning](http://semver.org/). + +## Unpublished + +### Updated +- Force fullscreen when kioskmode is active. + +### Added +- Added ability to remove tags from the beginning or end of newsfeed items in 'newsfeed.js'. +- Added ability to define "the day after tomorrow" for calendar events (Definition for German already included). + +## [2.0.4] - 2016-08-07 + +### Added +- Brazilian Portuguese Translation. +- Option to enable Kios mode. +- Added ability to start the app with Dev Tools. +- Added ability to turn off the date display in `clock.js` when in analog mode. +- Greek 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)) +- Corrected grammer in `module.js` from 'suspend' to 'suspended'. +- Fixed openweathermap.org URL in config sample. +- Prevent currentweather module from crashing when received data object is incorrect. +- Fix issue where translation loading prevented the UI start-up when the language was set to 'en'. (Issue [#388](https://github.com/MichMich/MagicMirror/issues/388)) + +### Updated +- Updated package.json to fix possible vulnerabilities. (Using Snyk) +- Updated weathericons +- Updated default weatherforecast to work with the new icons. +- More detailed error message in case config file couldn't be loaded. + +## [2.0.3] - 2016-07-12 +### Added +- Add max newsitems parameter to the newsfeed module. +- Translations for Simplified Chinese, Traditional Chinese and Japanese. +- Polish Translation +- Add an analog clock in addition to the digital one. + +### Fixed +- Edit Alert Module to display title & message if they are provided in the notification (Issue [#300](https://github.com/MichMich/MagicMirror/issues/300)) +- Removed 'null' reference from updateModuleContent(). This fixes recent Edge and Internet Explorer browser displays (Issue [#319](https://github.com/MichMich/MagicMirror/issues/319)) + +### Changed +- Added default string to calendar titleReplace. + +## [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 +### Added +- Changelog +- Italian Translation + +### Changed +- Improve the installer by fetching the latest Node.js without any 3rd party interferences. + +## [2.0.0] - 2016-05-03 +### Initial release of MagicMirror² +It includes (but is not limited to) the following features: +- Modular system allowing 3rd party plugins. +- An Node/Electron based application taking away the need for external servers or browsers. +- A complete development API documentation. +- Small cute fairies that kiss you while you sleep. + +## [1.0.0] - 2014-02-16 +### Initial release of MagicMirror. +This was part of the blogpost: http://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the