From a5668b1b99bfc168b92370c3aa8543da378a2f63 Mon Sep 17 00:00:00 2001 From: Kristjan SCHMIDT <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Wed, 26 Jan 2022 23:09:26 +0100 Subject: [PATCH 1/4] =?UTF-8?q?Magic=20Mirror=20->=20MagicMirror=C2=B2=20C?= =?UTF-8?q?onsistent=20spelling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.js.sample | 2 +- css/custom.css.sample | 2 +- js/app.js | 2 +- js/check_config.js | 2 +- js/defaults.js | 4 ++-- js/deprecated.js | 2 +- js/loader.js | 2 +- js/logger.js | 2 +- js/main.js | 2 +- js/module.js | 8 ++++---- js/node_helper.js | 2 +- js/server.js | 2 +- js/socketclient.js | 2 +- js/translator.js | 2 +- js/utils.js | 2 +- modules/default/alert/alert.js | 2 +- modules/default/calendar/calendar.js | 2 +- modules/default/calendar/calendarfetcher.js | 2 +- modules/default/calendar/calendarutils.js | 2 +- modules/default/calendar/node_helper.js | 2 +- modules/default/clock/clock.js | 2 +- modules/default/compliments/compliments.js | 2 +- modules/default/currentweather/currentweather.js | 2 +- modules/default/defaultmodules.js | 2 +- modules/default/helloworld/helloworld.js | 2 +- modules/default/newsfeed/newsfeed.js | 2 +- modules/default/newsfeed/newsfeedfetcher.js | 2 +- modules/default/newsfeed/node_helper.js | 2 +- modules/default/updatenotification/updatenotification.js | 2 +- modules/default/weather/providers/darksky.js | 2 +- modules/default/weather/providers/envcanada.js | 2 +- modules/default/weather/providers/openweathermap.js | 2 +- modules/default/weather/providers/smhi.js | 2 +- modules/default/weather/providers/ukmetoffice.js | 2 +- modules/default/weather/providers/ukmetofficedatahub.js | 2 +- modules/default/weather/providers/weatherbit.js | 2 +- modules/default/weather/providers/weathergov.js | 2 +- modules/default/weather/weather.js | 2 +- modules/default/weather/weatherobject.js | 2 +- modules/default/weather/weatherprovider.js | 2 +- modules/default/weatherforecast/weatherforecast.js | 2 +- package.json | 1 + tests/configs/default.js | 2 +- tests/configs/empty_ipWhiteList.js | 2 +- tests/configs/modules/alert/default.js | 2 +- tests/configs/modules/calendar/auth-default.js | 2 +- tests/configs/modules/calendar/basic-auth.js | 2 +- tests/configs/modules/calendar/changed-port.js | 2 +- tests/configs/modules/calendar/custom.js | 2 +- tests/configs/modules/calendar/default.js | 2 +- tests/configs/modules/calendar/fail-basic-auth.js | 2 +- tests/configs/modules/calendar/old-basic-auth.js | 2 +- tests/configs/modules/calendar/recurring.js | 2 +- tests/configs/modules/clock/clock_12hr.js | 2 +- tests/configs/modules/clock/clock_24hr.js | 2 +- tests/configs/modules/clock/clock_analog.js | 2 +- tests/configs/modules/clock/clock_displaySeconds_false.js | 2 +- tests/configs/modules/clock/clock_showPeriodUpper.js | 2 +- tests/configs/modules/clock/clock_showTime.js | 2 +- tests/configs/modules/clock/clock_showWeek.js | 2 +- tests/configs/modules/clock/es/clock_12hr.js | 2 +- tests/configs/modules/clock/es/clock_24hr.js | 2 +- tests/configs/modules/clock/es/clock_showPeriodUpper.js | 2 +- tests/configs/modules/clock/es/clock_showWeek.js | 2 +- tests/configs/modules/compliments/compliments_anytime.js | 2 +- tests/configs/modules/compliments/compliments_date.js | 2 +- .../modules/compliments/compliments_only_anytime.js | 2 +- .../configs/modules/compliments/compliments_parts_day.js | 2 +- tests/configs/modules/display.js | 2 +- tests/configs/modules/helloworld/helloworld.js | 2 +- tests/configs/modules/helloworld/helloworld_default.js | 2 +- tests/configs/modules/newsfeed/default.js | 2 +- tests/configs/modules/newsfeed/ignore_items.js | 2 +- tests/configs/modules/newsfeed/incorrect_url.js | 2 +- tests/configs/modules/newsfeed/prohibited_words.js | 2 +- tests/configs/modules/positions.js | 2 +- .../configs/modules/weather/currentweather_compliments.js | 2 +- tests/configs/modules/weather/currentweather_default.js | 2 +- tests/configs/modules/weather/currentweather_options.js | 2 +- tests/configs/modules/weather/currentweather_units.js | 2 +- tests/configs/modules/weather/forecastweather_absolute.js | 2 +- tests/configs/modules/weather/forecastweather_default.js | 2 +- tests/configs/modules/weather/forecastweather_options.js | 2 +- tests/configs/modules/weather/forecastweather_units.js | 2 +- tests/configs/noIpWhiteList.js | 2 +- tests/configs/port_8090.js | 2 +- tests/configs/without_modules.js | 2 +- tests/e2e/without_modules.js | 2 +- translations/translations.js | 2 +- vendor/vendor.js | 2 +- 90 files changed, 94 insertions(+), 93 deletions(-) diff --git a/config/config.js.sample b/config/config.js.sample index 1c9ffdc0..9ab4e659 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -1,4 +1,4 @@ -/* Magic Mirror Config Sample +/* MagicMirror² Config Sample * * By Michael Teeuw https://michaelteeuw.nl * MIT Licensed. diff --git a/css/custom.css.sample b/css/custom.css.sample index ac5b5e2e..48cc17a0 100644 --- a/css/custom.css.sample +++ b/css/custom.css.sample @@ -1,4 +1,4 @@ -/* Magic Mirror Custom CSS Sample +/* MagicMirror² Custom CSS Sample * * Change color and fonts here. * diff --git a/js/app.js b/js/app.js index 9ead45b2..fe66b0ce 100644 --- a/js/app.js +++ b/js/app.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * The Core App (Server) * * By Michael Teeuw https://michaelteeuw.nl diff --git a/js/check_config.js b/js/check_config.js index 60b4cdf3..abc0940b 100644 --- a/js/check_config.js +++ b/js/check_config.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * * Check the configuration file for errors * diff --git a/js/defaults.js b/js/defaults.js index 0173a594..53f9c90d 100644 --- a/js/defaults.js +++ b/js/defaults.js @@ -1,6 +1,6 @@ /* global mmPort */ -/* Magic Mirror +/* MagicMirror² * Config Defaults * * By Michael Teeuw https://michaelteeuw.nl @@ -36,7 +36,7 @@ const defaults = { position: "upper_third", classes: "large thin", config: { - text: "Magic Mirror2" + text: "MagicMirror²" } }, { diff --git a/js/deprecated.js b/js/deprecated.js index 6bf4a626..e2c70322 100644 --- a/js/deprecated.js +++ b/js/deprecated.js @@ -1,4 +1,4 @@ -/* Magic Mirror Deprecated Config Options List +/* MagicMirror² Deprecated Config Options List * * By Michael Teeuw https://michaelteeuw.nl * MIT Licensed. diff --git a/js/loader.js b/js/loader.js index e3c88be4..70ed32c5 100644 --- a/js/loader.js +++ b/js/loader.js @@ -1,6 +1,6 @@ /* global defaultModules, vendor */ -/* Magic Mirror +/* MagicMirror² * Module and File loaders. * * By Michael Teeuw https://michaelteeuw.nl diff --git a/js/logger.js b/js/logger.js index 0ea523d7..e6a244cb 100644 --- a/js/logger.js +++ b/js/logger.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Log * * This logger is very simple, but needs to be extended. diff --git a/js/main.js b/js/main.js index dfb79708..8d1db9ea 100644 --- a/js/main.js +++ b/js/main.js @@ -1,6 +1,6 @@ /* global Loader, defaults, Translator */ -/* Magic Mirror +/* MagicMirror² * Main System * * By Michael Teeuw https://michaelteeuw.nl diff --git a/js/module.js b/js/module.js index 84222fa3..bb78c383 100644 --- a/js/module.js +++ b/js/module.js @@ -1,6 +1,6 @@ /* global Class, cloneObject, Loader, MMSocket, nunjucks, Translator */ -/* Magic Mirror +/* MagicMirror² * Module Blueprint. * @typedef {Object} Module * @@ -74,7 +74,7 @@ const Module = Class.extend({ }, /** - * Generates the dom which needs to be displayed. This method is called by the Magic Mirror core. + * Generates the dom which needs to be displayed. This method is called by the MagicMirror² core. * This method can to be subclassed if the module wants to display info on the mirror. * Alternatively, the getTemplate method could be subclassed. * @@ -109,7 +109,7 @@ const Module = Class.extend({ /** * Generates the header string which needs to be displayed if a user has a header configured for this module. - * This method is called by the Magic Mirror core, but only if the user has configured a default header for the module. + * This method is called by the MagicMirror² core, but only if the user has configured a default header for the module. * This method needs to be subclassed if the module wants to display modified headers on the mirror. * * @returns {string} The header to display above the header. @@ -141,7 +141,7 @@ const Module = Class.extend({ }, /** - * Called by the Magic Mirror core when a notification arrives. + * Called by the MagicMirror² core when a notification arrives. * * @param {string} notification The identifier of the notification. * @param {*} payload The payload of the notification. diff --git a/js/node_helper.js b/js/node_helper.js index 86ad3aa4..067ae64a 100644 --- a/js/node_helper.js +++ b/js/node_helper.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Node Helper Superclass * * By Michael Teeuw https://michaelteeuw.nl diff --git a/js/server.js b/js/server.js index 3e48323d..de07bfcc 100644 --- a/js/server.js +++ b/js/server.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Server * * By Michael Teeuw https://michaelteeuw.nl diff --git a/js/socketclient.js b/js/socketclient.js index acb8cfdc..8b3aec82 100644 --- a/js/socketclient.js +++ b/js/socketclient.js @@ -1,6 +1,6 @@ /* global io */ -/* Magic Mirror +/* MagicMirror² * TODO add description * * By Michael Teeuw https://michaelteeuw.nl diff --git a/js/translator.js b/js/translator.js index d69a9a1a..78f2e5b5 100644 --- a/js/translator.js +++ b/js/translator.js @@ -1,6 +1,6 @@ /* global translations */ -/* Magic Mirror +/* MagicMirror² * Translator (l10n) * * By Christopher Fenner https://github.com/CFenner diff --git a/js/utils.js b/js/utils.js index 1043ae3e..d111afca 100644 --- a/js/utils.js +++ b/js/utils.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Utils * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js index 0ed34fb0..76bacc02 100644 --- a/modules/default/alert/alert.js +++ b/modules/default/alert/alert.js @@ -1,6 +1,6 @@ /* global NotificationFx */ -/* Magic Mirror +/* MagicMirror² * Module: alert * * By Paul-Vincent Roll https://paulvincentroll.com/ diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 9612bbee..4c3a26f5 100755 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -1,6 +1,6 @@ /* global cloneObject */ -/* Magic Mirror +/* MagicMirror² * Module: Calendar * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js index 16f1db90..f27025d7 100644 --- a/modules/default/calendar/calendarfetcher.js +++ b/modules/default/calendar/calendarfetcher.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Node Helper: Calendar - CalendarFetcher * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/calendar/calendarutils.js b/modules/default/calendar/calendarutils.js index f7409b5c..c00e50d8 100644 --- a/modules/default/calendar/calendarutils.js +++ b/modules/default/calendar/calendarutils.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Calendar Util Methods * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/calendar/node_helper.js b/modules/default/calendar/node_helper.js index 5b1a8bad..21fa7e0e 100644 --- a/modules/default/calendar/node_helper.js +++ b/modules/default/calendar/node_helper.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Node Helper: Calendar * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js index df2364a4..7c9310f0 100644 --- a/modules/default/clock/clock.js +++ b/modules/default/clock/clock.js @@ -1,6 +1,6 @@ /* global SunCalc */ -/* Magic Mirror +/* MagicMirror² * Module: Clock * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/compliments/compliments.js b/modules/default/compliments/compliments.js index 054a409f..c1168295 100644 --- a/modules/default/compliments/compliments.js +++ b/modules/default/compliments/compliments.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Module: Compliments * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index f7b3ffe3..60f584e0 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -1,6 +1,6 @@ /* eslint-disable */ -/* Magic Mirror +/* MagicMirror² * Module: CurrentWeather * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/defaultmodules.js b/modules/default/defaultmodules.js index 46bb5b87..beba69b4 100644 --- a/modules/default/defaultmodules.js +++ b/modules/default/defaultmodules.js @@ -1,4 +1,4 @@ -/* Magic Mirror Default Modules List +/* MagicMirror² Default Modules List * Modules listed below can be loaded without the 'default/' prefix. Omitting the default folder name. * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/helloworld/helloworld.js b/modules/default/helloworld/helloworld.js index 68eb22fc..53357d0f 100644 --- a/modules/default/helloworld/helloworld.js +++ b/modules/default/helloworld/helloworld.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Module: HelloWorld * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index b963c643..67eb63bf 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Module: NewsFeed * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/newsfeed/newsfeedfetcher.js b/modules/default/newsfeed/newsfeedfetcher.js index 78bb1ab7..dc69e4ce 100644 --- a/modules/default/newsfeed/newsfeedfetcher.js +++ b/modules/default/newsfeed/newsfeedfetcher.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Node Helper: Newsfeed - NewsfeedFetcher * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/newsfeed/node_helper.js b/modules/default/newsfeed/node_helper.js index 32656a9f..e8816b83 100644 --- a/modules/default/newsfeed/node_helper.js +++ b/modules/default/newsfeed/node_helper.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Node Helper: Newsfeed * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/updatenotification/updatenotification.js b/modules/default/updatenotification/updatenotification.js index 8c3bb6af..7b4945c9 100644 --- a/modules/default/updatenotification/updatenotification.js +++ b/modules/default/updatenotification/updatenotification.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Module: UpdateNotification * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/weather/providers/darksky.js b/modules/default/weather/providers/darksky.js index 451ac98b..16355dd0 100755 --- a/modules/default/weather/providers/darksky.js +++ b/modules/default/weather/providers/darksky.js @@ -1,6 +1,6 @@ /* global WeatherProvider, WeatherObject */ -/* Magic Mirror +/* MagicMirror² * Module: Weather * Provider: Dark Sky * diff --git a/modules/default/weather/providers/envcanada.js b/modules/default/weather/providers/envcanada.js index 868ee6e2..5208e005 100644 --- a/modules/default/weather/providers/envcanada.js +++ b/modules/default/weather/providers/envcanada.js @@ -1,6 +1,6 @@ /* global WeatherProvider, WeatherObject */ -/* Magic Mirror +/* MagicMirror² * Module: Weather * Provider: Environment Canada (EC) * diff --git a/modules/default/weather/providers/openweathermap.js b/modules/default/weather/providers/openweathermap.js index c1258d3c..f009e09a 100755 --- a/modules/default/weather/providers/openweathermap.js +++ b/modules/default/weather/providers/openweathermap.js @@ -1,6 +1,6 @@ /* global WeatherProvider, WeatherObject */ -/* Magic Mirror +/* MagicMirror² * Module: Weather * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/weather/providers/smhi.js b/modules/default/weather/providers/smhi.js index 603aa814..e01b0749 100644 --- a/modules/default/weather/providers/smhi.js +++ b/modules/default/weather/providers/smhi.js @@ -1,6 +1,6 @@ /* global WeatherProvider, WeatherObject */ -/* Magic Mirror +/* MagicMirror² * Module: Weather * Provider: SMHI * diff --git a/modules/default/weather/providers/ukmetoffice.js b/modules/default/weather/providers/ukmetoffice.js index 158592bd..23ec29bf 100755 --- a/modules/default/weather/providers/ukmetoffice.js +++ b/modules/default/weather/providers/ukmetoffice.js @@ -1,6 +1,6 @@ /* global WeatherProvider, WeatherObject */ -/* Magic Mirror +/* MagicMirror² * Module: Weather * * By Malcolm Oakes https://github.com/maloakes diff --git a/modules/default/weather/providers/ukmetofficedatahub.js b/modules/default/weather/providers/ukmetofficedatahub.js index bab1220d..216f6619 100644 --- a/modules/default/weather/providers/ukmetofficedatahub.js +++ b/modules/default/weather/providers/ukmetofficedatahub.js @@ -1,6 +1,6 @@ /* global WeatherProvider, WeatherObject */ -/* Magic Mirror +/* MagicMirror² * Module: Weather * * By Malcolm Oakes https://github.com/maloakes diff --git a/modules/default/weather/providers/weatherbit.js b/modules/default/weather/providers/weatherbit.js index 17f27812..06a3f503 100644 --- a/modules/default/weather/providers/weatherbit.js +++ b/modules/default/weather/providers/weatherbit.js @@ -1,6 +1,6 @@ /* global WeatherProvider, WeatherObject */ -/* Magic Mirror +/* MagicMirror² * Module: Weather * Provider: Weatherbit * diff --git a/modules/default/weather/providers/weathergov.js b/modules/default/weather/providers/weathergov.js index 31934784..9cc0e6f6 100755 --- a/modules/default/weather/providers/weathergov.js +++ b/modules/default/weather/providers/weathergov.js @@ -1,6 +1,6 @@ /* global WeatherProvider, WeatherObject */ -/* Magic Mirror +/* MagicMirror² * Module: Weather * Provider: weather.gov * https://weather-gov.github.io/api/general-faqs diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js index e4acc733..350c4f2d 100644 --- a/modules/default/weather/weather.js +++ b/modules/default/weather/weather.js @@ -1,6 +1,6 @@ /* global WeatherProvider */ -/* Magic Mirror +/* MagicMirror² * Module: Weather * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/weather/weatherobject.js b/modules/default/weather/weatherobject.js index 4501f681..e9359345 100755 --- a/modules/default/weather/weatherobject.js +++ b/modules/default/weather/weatherobject.js @@ -1,6 +1,6 @@ /* global SunCalc */ -/* Magic Mirror +/* MagicMirror² * Module: Weather * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/weather/weatherprovider.js b/modules/default/weather/weatherprovider.js index 5721dad6..d08dc30f 100644 --- a/modules/default/weather/weatherprovider.js +++ b/modules/default/weather/weatherprovider.js @@ -1,6 +1,6 @@ /* global Class */ -/* Magic Mirror +/* MagicMirror² * Module: Weather * * By Michael Teeuw https://michaelteeuw.nl diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js index 54216986..c94fabf7 100644 --- a/modules/default/weatherforecast/weatherforecast.js +++ b/modules/default/weatherforecast/weatherforecast.js @@ -1,6 +1,6 @@ /* eslint-disable */ -/* Magic Mirror +/* MagicMirror² * Module: CurrentWeather * * By Michael Teeuw https://michaelteeuw.nl diff --git a/package.json b/package.json index b3cae096..f014ef58 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ }, "keywords": [ "magic mirror", + "magicmirror", "smart mirror", "mirror UI", "modular" diff --git a/tests/configs/default.js b/tests/configs/default.js index 5568e5e0..7d0f8eed 100644 --- a/tests/configs/default.js +++ b/tests/configs/default.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test default config for modules +/* MagicMirror² Test default config for modules * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/empty_ipWhiteList.js b/tests/configs/empty_ipWhiteList.js index cdf637c5..d49f7a9f 100644 --- a/tests/configs/empty_ipWhiteList.js +++ b/tests/configs/empty_ipWhiteList.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config sample ipWhitelist +/* MagicMirror² Test config sample ipWhitelist * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/alert/default.js b/tests/configs/modules/alert/default.js index 423260c7..45ffefe5 100644 --- a/tests/configs/modules/alert/default.js +++ b/tests/configs/modules/alert/default.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config sample module alert +/* MagicMirror² Test config sample module alert * * By rejas * MIT Licensed. diff --git a/tests/configs/modules/calendar/auth-default.js b/tests/configs/modules/calendar/auth-default.js index a120c7ca..a4ef4ba1 100644 --- a/tests/configs/modules/calendar/auth-default.js +++ b/tests/configs/modules/calendar/auth-default.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default calendar with auth by default +/* MagicMirror² Test config default calendar with auth by default * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/calendar/basic-auth.js b/tests/configs/modules/calendar/basic-auth.js index ebca135a..9290a43b 100644 --- a/tests/configs/modules/calendar/basic-auth.js +++ b/tests/configs/modules/calendar/basic-auth.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default calendar +/* MagicMirror² Test config default calendar * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/calendar/changed-port.js b/tests/configs/modules/calendar/changed-port.js index 05d6d1ff..09aeb589 100644 --- a/tests/configs/modules/calendar/changed-port.js +++ b/tests/configs/modules/calendar/changed-port.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default calendar with auth by default +/* MagicMirror² Test config default calendar with auth by default * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/calendar/custom.js b/tests/configs/modules/calendar/custom.js index 068db9be..2b396f80 100644 --- a/tests/configs/modules/calendar/custom.js +++ b/tests/configs/modules/calendar/custom.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config custom calendar +/* MagicMirror² Test config custom calendar * * By Rejas * MIT Licensed. diff --git a/tests/configs/modules/calendar/default.js b/tests/configs/modules/calendar/default.js index 0c9b8151..cd50a0ae 100644 --- a/tests/configs/modules/calendar/default.js +++ b/tests/configs/modules/calendar/default.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default calendar +/* MagicMirror² Test config default calendar * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/calendar/fail-basic-auth.js b/tests/configs/modules/calendar/fail-basic-auth.js index 1d2f8c76..39c17927 100644 --- a/tests/configs/modules/calendar/fail-basic-auth.js +++ b/tests/configs/modules/calendar/fail-basic-auth.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test calendar calendar +/* MagicMirror² Test calendar calendar * * This configuration is a wrong authentication * diff --git a/tests/configs/modules/calendar/old-basic-auth.js b/tests/configs/modules/calendar/old-basic-auth.js index 743ff04d..c1fb5590 100644 --- a/tests/configs/modules/calendar/old-basic-auth.js +++ b/tests/configs/modules/calendar/old-basic-auth.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default calendar +/* MagicMirror² Test config default calendar * with authentication old config * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/calendar/recurring.js b/tests/configs/modules/calendar/recurring.js index 567a366c..a513d35d 100644 --- a/tests/configs/modules/calendar/recurring.js +++ b/tests/configs/modules/calendar/recurring.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config custom calendar +/* MagicMirror² Test config custom calendar * * By Rejas * MIT Licensed. diff --git a/tests/configs/modules/clock/clock_12hr.js b/tests/configs/modules/clock/clock_12hr.js index 6b8917bd..18170e7c 100644 --- a/tests/configs/modules/clock/clock_12hr.js +++ b/tests/configs/modules/clock/clock_12hr.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default clock module +/* MagicMirror² Test config for default clock module * * By Sergey Morozov * MIT Licensed. diff --git a/tests/configs/modules/clock/clock_24hr.js b/tests/configs/modules/clock/clock_24hr.js index 27f89d0c..f9bd4514 100644 --- a/tests/configs/modules/clock/clock_24hr.js +++ b/tests/configs/modules/clock/clock_24hr.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default clock module +/* MagicMirror² Test config for default clock module * * By Sergey Morozov * MIT Licensed. diff --git a/tests/configs/modules/clock/clock_analog.js b/tests/configs/modules/clock/clock_analog.js index cbe3fecc..fdca5615 100644 --- a/tests/configs/modules/clock/clock_analog.js +++ b/tests/configs/modules/clock/clock_analog.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for analog clock face +/* MagicMirror² Test config for analog clock face * * MIT Licensed. */ diff --git a/tests/configs/modules/clock/clock_displaySeconds_false.js b/tests/configs/modules/clock/clock_displaySeconds_false.js index 57bf006a..cf333320 100644 --- a/tests/configs/modules/clock/clock_displaySeconds_false.js +++ b/tests/configs/modules/clock/clock_displaySeconds_false.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default clock module +/* MagicMirror² Test config for default clock module * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/clock/clock_showPeriodUpper.js b/tests/configs/modules/clock/clock_showPeriodUpper.js index 1e01644f..3dd8b5c5 100644 --- a/tests/configs/modules/clock/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/clock_showPeriodUpper.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default clock module +/* MagicMirror² Test config for default clock module * * By Sergey Morozov * MIT Licensed. diff --git a/tests/configs/modules/clock/clock_showTime.js b/tests/configs/modules/clock/clock_showTime.js index 37bdc5cc..17ea4590 100644 --- a/tests/configs/modules/clock/clock_showTime.js +++ b/tests/configs/modules/clock/clock_showTime.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default clock module +/* MagicMirror² Test config for default clock module * * By Johan Hammar * MIT Licensed. diff --git a/tests/configs/modules/clock/clock_showWeek.js b/tests/configs/modules/clock/clock_showWeek.js index 2c421e85..71377e0b 100644 --- a/tests/configs/modules/clock/clock_showWeek.js +++ b/tests/configs/modules/clock/clock_showWeek.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default clock module +/* MagicMirror² Test config for default clock module * * By Johan Hammar * MIT Licensed. diff --git a/tests/configs/modules/clock/es/clock_12hr.js b/tests/configs/modules/clock/es/clock_12hr.js index 07e5206a..44444c06 100644 --- a/tests/configs/modules/clock/es/clock_12hr.js +++ b/tests/configs/modules/clock/es/clock_12hr.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default clock module +/* MagicMirror² Test config for default clock module * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/clock/es/clock_24hr.js b/tests/configs/modules/clock/es/clock_24hr.js index 469f4e3b..66b5304d 100644 --- a/tests/configs/modules/clock/es/clock_24hr.js +++ b/tests/configs/modules/clock/es/clock_24hr.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default clock module +/* MagicMirror² Test config for default clock module * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/clock/es/clock_showPeriodUpper.js b/tests/configs/modules/clock/es/clock_showPeriodUpper.js index 0253c28c..5e1fbb4b 100644 --- a/tests/configs/modules/clock/es/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/es/clock_showPeriodUpper.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default clock module +/* MagicMirror² Test config for default clock module * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/clock/es/clock_showWeek.js b/tests/configs/modules/clock/es/clock_showWeek.js index dd8f6cd2..73635c0e 100644 --- a/tests/configs/modules/clock/es/clock_showWeek.js +++ b/tests/configs/modules/clock/es/clock_showWeek.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default clock module +/* MagicMirror² Test config for default clock module * Language es for showWeek feature * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com diff --git a/tests/configs/modules/compliments/compliments_anytime.js b/tests/configs/modules/compliments/compliments_anytime.js index 2034b379..89253d91 100644 --- a/tests/configs/modules/compliments/compliments_anytime.js +++ b/tests/configs/modules/compliments/compliments_anytime.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config compliments with anytime type +/* MagicMirror² Test config compliments with anytime type * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/compliments/compliments_date.js b/tests/configs/modules/compliments/compliments_date.js index a89dd7de..d84a6bde 100644 --- a/tests/configs/modules/compliments/compliments_date.js +++ b/tests/configs/modules/compliments/compliments_date.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config compliments with date type +/* MagicMirror² Test config compliments with date type * * By Rejas * MIT Licensed. diff --git a/tests/configs/modules/compliments/compliments_only_anytime.js b/tests/configs/modules/compliments/compliments_only_anytime.js index 5261e58b..f1da683a 100644 --- a/tests/configs/modules/compliments/compliments_only_anytime.js +++ b/tests/configs/modules/compliments/compliments_only_anytime.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config compliments with anytime type +/* MagicMirror² Test config compliments with anytime type * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/compliments/compliments_parts_day.js b/tests/configs/modules/compliments/compliments_parts_day.js index 08c9d94e..ff34803a 100644 --- a/tests/configs/modules/compliments/compliments_parts_day.js +++ b/tests/configs/modules/compliments/compliments_parts_day.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default compliments +/* MagicMirror² Test config for default compliments * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/display.js b/tests/configs/modules/display.js index 03aa4f19..a4166077 100644 --- a/tests/configs/modules/display.js +++ b/tests/configs/modules/display.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for display setters module using the helloworld module +/* MagicMirror² Test config for display setters module using the helloworld module * * By Rejas * MIT Licensed. diff --git a/tests/configs/modules/helloworld/helloworld.js b/tests/configs/modules/helloworld/helloworld.js index 39480bc1..72256621 100644 --- a/tests/configs/modules/helloworld/helloworld.js +++ b/tests/configs/modules/helloworld/helloworld.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config sample module hello world +/* MagicMirror² Test config sample module hello world * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/helloworld/helloworld_default.js b/tests/configs/modules/helloworld/helloworld_default.js index ea95ad83..06e6fe8d 100644 --- a/tests/configs/modules/helloworld/helloworld_default.js +++ b/tests/configs/modules/helloworld/helloworld_default.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config sample module hello world default config +/* MagicMirror² Test config sample module hello world default config * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/newsfeed/default.js b/tests/configs/modules/newsfeed/default.js index 7758da0c..00bf569d 100644 --- a/tests/configs/modules/newsfeed/default.js +++ b/tests/configs/modules/newsfeed/default.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config newsfeed module +/* MagicMirror² Test config newsfeed module * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/newsfeed/ignore_items.js b/tests/configs/modules/newsfeed/ignore_items.js index 8b12a10a..bbcf4db2 100644 --- a/tests/configs/modules/newsfeed/ignore_items.js +++ b/tests/configs/modules/newsfeed/ignore_items.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config newsfeed module +/* MagicMirror² Test config newsfeed module * * MIT Licensed. */ diff --git a/tests/configs/modules/newsfeed/incorrect_url.js b/tests/configs/modules/newsfeed/incorrect_url.js index 522fa2d1..f9d75b09 100644 --- a/tests/configs/modules/newsfeed/incorrect_url.js +++ b/tests/configs/modules/newsfeed/incorrect_url.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config newsfeed module +/* MagicMirror² Test config newsfeed module * * MIT Licensed. */ diff --git a/tests/configs/modules/newsfeed/prohibited_words.js b/tests/configs/modules/newsfeed/prohibited_words.js index 68d22f54..42eb572f 100644 --- a/tests/configs/modules/newsfeed/prohibited_words.js +++ b/tests/configs/modules/newsfeed/prohibited_words.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config newsfeed module +/* MagicMirror² Test config newsfeed module * * MIT Licensed. */ diff --git a/tests/configs/modules/positions.js b/tests/configs/modules/positions.js index 186c25f9..6086fadd 100644 --- a/tests/configs/modules/positions.js +++ b/tests/configs/modules/positions.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for position setters module using the helloworld module +/* MagicMirror² Test config for position setters module using the helloworld module * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/weather/currentweather_compliments.js b/tests/configs/modules/weather/currentweather_compliments.js index 6efd43fe..4af54466 100644 --- a/tests/configs/modules/weather/currentweather_compliments.js +++ b/tests/configs/modules/weather/currentweather_compliments.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config current weather compliments +/* MagicMirror² Test config current weather compliments * * By rejas https://github.com/rejas * MIT Licensed. diff --git a/tests/configs/modules/weather/currentweather_default.js b/tests/configs/modules/weather/currentweather_default.js index d7efb0a3..e2ef16b7 100644 --- a/tests/configs/modules/weather/currentweather_default.js +++ b/tests/configs/modules/weather/currentweather_default.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default weather +/* MagicMirror² Test config default weather * * By fewieden https://github.com/fewieden * MIT Licensed. diff --git a/tests/configs/modules/weather/currentweather_options.js b/tests/configs/modules/weather/currentweather_options.js index db4f8ff7..bd433f64 100644 --- a/tests/configs/modules/weather/currentweather_options.js +++ b/tests/configs/modules/weather/currentweather_options.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default weather +/* MagicMirror² Test config default weather * * By fewieden https://github.com/fewieden * MIT Licensed. diff --git a/tests/configs/modules/weather/currentweather_units.js b/tests/configs/modules/weather/currentweather_units.js index 48c46f60..ac007314 100644 --- a/tests/configs/modules/weather/currentweather_units.js +++ b/tests/configs/modules/weather/currentweather_units.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default weather +/* MagicMirror² Test config default weather * * By fewieden https://github.com/fewieden * MIT Licensed. diff --git a/tests/configs/modules/weather/forecastweather_absolute.js b/tests/configs/modules/weather/forecastweather_absolute.js index 92db7acf..9972383b 100644 --- a/tests/configs/modules/weather/forecastweather_absolute.js +++ b/tests/configs/modules/weather/forecastweather_absolute.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default weather +/* MagicMirror² Test config default weather * * By fewieden https://github.com/fewieden * MIT Licensed. diff --git a/tests/configs/modules/weather/forecastweather_default.js b/tests/configs/modules/weather/forecastweather_default.js index 05dc10ea..6f535b39 100644 --- a/tests/configs/modules/weather/forecastweather_default.js +++ b/tests/configs/modules/weather/forecastweather_default.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default weather +/* MagicMirror² Test config default weather * * By fewieden https://github.com/fewieden * MIT Licensed. diff --git a/tests/configs/modules/weather/forecastweather_options.js b/tests/configs/modules/weather/forecastweather_options.js index 755407e5..23cda84f 100644 --- a/tests/configs/modules/weather/forecastweather_options.js +++ b/tests/configs/modules/weather/forecastweather_options.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default weather +/* MagicMirror² Test config default weather * * By fewieden https://github.com/fewieden * MIT Licensed. diff --git a/tests/configs/modules/weather/forecastweather_units.js b/tests/configs/modules/weather/forecastweather_units.js index 6fc2d456..7e1ac86f 100644 --- a/tests/configs/modules/weather/forecastweather_units.js +++ b/tests/configs/modules/weather/forecastweather_units.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config default weather +/* MagicMirror² Test config default weather * * By rejas * MIT Licensed. diff --git a/tests/configs/noIpWhiteList.js b/tests/configs/noIpWhiteList.js index 40655480..36035c16 100644 --- a/tests/configs/noIpWhiteList.js +++ b/tests/configs/noIpWhiteList.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config sample ipWhitelist +/* MagicMirror² Test config sample ipWhitelist * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/port_8090.js b/tests/configs/port_8090.js index 7756fb76..df6bf7dc 100644 --- a/tests/configs/port_8090.js +++ b/tests/configs/port_8090.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config sample environment set port 8090 +/* MagicMirror² Test config sample environment set port 8090 * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/without_modules.js b/tests/configs/without_modules.js index 50ff521e..51ce02f6 100644 --- a/tests/configs/without_modules.js +++ b/tests/configs/without_modules.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test default config for modules +/* MagicMirror² Test default config for modules * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/e2e/without_modules.js b/tests/e2e/without_modules.js index 7ebd5d77..41320631 100644 --- a/tests/e2e/without_modules.js +++ b/tests/e2e/without_modules.js @@ -12,7 +12,7 @@ describe("Check configuration without modules", function () { it("Show the message MagicMirror title", function () { helpers.waitForElement("#module_1_helloworld .module-content").then((elem) => { expect(elem).not.toBe(null); - expect(elem.textContent).toContain("Magic Mirror2"); + expect(elem.textContent).toContain("MagicMirror²"); }); }); diff --git a/translations/translations.js b/translations/translations.js index e321d8f7..0be9ebde 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Translation Definition * * By Michael Teeuw https://michaelteeuw.nl diff --git a/vendor/vendor.js b/vendor/vendor.js index 69d300e8..7d7a2a8e 100755 --- a/vendor/vendor.js +++ b/vendor/vendor.js @@ -1,4 +1,4 @@ -/* Magic Mirror +/* MagicMirror² * Vendor File Definition * * By Michael Teeuw https://michaelteeuw.nl From 7e79547973d43b1838c7fc75ac749e3973701b9f Mon Sep 17 00:00:00 2001 From: Kristjan SCHMIDT <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Wed, 26 Jan 2022 23:16:22 +0100 Subject: [PATCH 2/4] =?UTF-8?q?Add=20"Using=20a=20consistent=20spelling=20?= =?UTF-8?q?of=20MagicMirror=C2=B2."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e9fd44b..0df6edec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ _This release is scheduled to be released on 2022-04-01._ - improved and speedup e2e tests, artificial wait after mm start removed. - improved husky setup not blocking `git commit` if `husky` or `npm` is not installed. +- Using a consistent spelling of MagicMirror². ## [2.18.0] - 2022-01-01 From 6f27e5ae071a283437974198e21c592c1921a92f Mon Sep 17 00:00:00 2001 From: Kristjan SCHMIDT <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Wed, 26 Jan 2022 23:47:51 +0100 Subject: [PATCH 3/4] =?UTF-8?q?MagicMirror=20->=20MagicMirror=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/CONTRIBUTING.md | 2 +- .github/ISSUE_TEMPLATE.md | 12 ++++++------ .github/PULL_REQUEST_TEMPLATE.md | 2 +- CHANGELOG.md | 16 ++++++++-------- config/config.js.sample | 2 +- fonts/package.json | 2 +- js/app.js | 4 ++-- js/defaults.js | 2 +- js/main.js | 2 +- js/module.js | 6 +++--- js/node_helper.js | 2 +- modules/default/alert/README.md | 2 +- modules/default/alert/translations/bg.json | 2 +- modules/default/alert/translations/da.json | 2 +- modules/default/alert/translations/de.json | 2 +- modules/default/alert/translations/en.json | 2 +- modules/default/alert/translations/es.json | 2 +- modules/default/alert/translations/fr.json | 2 +- modules/default/alert/translations/hu.json | 2 +- modules/default/alert/translations/nl.json | 2 +- modules/default/alert/translations/ru.json | 2 +- modules/default/calendar/README.md | 2 +- modules/default/calendar/debug.js | 2 +- modules/default/clock/README.md | 2 +- modules/default/compliments/README.md | 2 +- modules/default/helloworld/README.md | 2 +- modules/default/newsfeed/README.md | 2 +- modules/default/updatenotification/README.md | 4 ++-- modules/default/weather/providers/smhi.js | 2 +- package.json | 2 +- tests/e2e/modules/basic-auth.js | 2 +- tests/e2e/without_modules.js | 2 +- translations/he.json | 2 +- translations/pt-br.json | 2 +- vendor/package.json | 2 +- 35 files changed, 51 insertions(+), 51 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3563f85e..0cd23540 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -44,7 +44,7 @@ When submitting a new issue, please supply the following information: **Node Version**: Make sure it's version 14 or later (recommended is 16). -**MagicMirror Version**: Please let us know which version of MagicMirror you are running. It can be found in the `package.json` file. +**MagicMirror² Version**: Please let us know which version of MagicMirror² you are running. It can be found in the `package.json` file. **Description**: Provide a detailed description about the issue and include specific details to help us understand the problem. Adding screenshots will help describing the problem. diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index b441c20a..cc60558d 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -10,16 +10,16 @@ If you're not sure if it's a real bug or if it's just you, please open a topic o Problems installing or configuring your MagicMirror? Check out: [https://forum.magicmirror.builders/category/10/troubleshooting](https://forum.magicmirror.builders/category/10/troubleshooting) -A common problem is that your config file could be invalid. Please run in your MagicMirror directory: `npm run config:check` and see if it reports an error. +A common problem is that your config file could be invalid. Please run in your MagicMirror² directory: `npm run config:check` and see if it reports an error. -## I found a bug in the MagicMirror installer +## I found a bug in the MagicMirror² installer -If you are facing an issue or found a bug while trying to install MagicMirror via the installer please report it in the respective GitHub repository: +If you are facing an issue or found a bug while trying to install MagicMirror² via the installer please report it in the respective GitHub repository: [https://github.com/sdetweil/MagicMirror_scripts](https://github.com/sdetweil/MagicMirror_scripts) -## I found a bug in the MagicMirror Docker image +## I found a bug in the MagicMirror² Docker image -If you are facing an issue or found a bug while running MagicMirror inside a Docker container please create an issue in the corresponding repository: +If you are facing an issue or found a bug while running MagicMirror² inside a Docker container please create an issue in the corresponding repository: - karsten13/magicmirror: [https://gitlab.com/khassel/magicmirror](https://gitlab.com/khassel/magicmirror) - (deprecated) bastilimbach/docker-magicmirror: [https://github.com/bastilimbach/docker-MagicMirror](https://github.com/bastilimbach/docker-MagicMirror) @@ -35,7 +35,7 @@ When submitting a new issue, please supply the following information: **Node Version**: Make sure it's version 14 or later (recommended is 16). -**MagicMirror Version**: Please let us know which version of MagicMirror you are running. It can be found in the `package.json` file. +**MagicMirror² Version**: Please let us know which version of MagicMirror² you are running. It can be found in the `package.json` file. **Description**: Provide a detailed description about the issue and include specific details to help us understand the problem. Adding screenshots will help describing the problem. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b1d5833f..da43f700 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,4 @@ -Hello and thank you for wanting to contribute to the MagicMirror project +Hello and thank you for wanting to contribute to the MagicMirror² project **Please make sure that you have followed these 4 rules before submitting your Pull Request:** diff --git a/CHANGELOG.md b/CHANGELOG.md index 0df6edec..71c438f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -301,8 +301,8 @@ Special thanks to the following contributors: @bryanzzhu, @bugsounet, @chamakura ### Added - `--dry-run` Added option in fetch call within updatenotification node_helper. This is to prevent - MagicMirror from consuming any fetch result. Causes conflict with MMPM when attempting to check - for updates to MagicMirror and/or MagicMirror modules. + MagicMirror² from consuming any fetch result. Causes conflict with MMPM when attempting to check + for updates to MagicMirror² and/or MagicMirror² modules. - Test coverage with Istanbul, run it with `npm run test:coverage`. - Added lithuanian language. - Added support in weatherforecast for OpenWeather onecall API. @@ -375,7 +375,7 @@ Special thanks to the following contributors: @AndreKoepke, @andrezibaia, @bryan 🚨 READ THIS BEFORE UPDATING 🚨 -In the past years the project has grown a lot. This came with a huge downside: poor maintainability. If I let the project continue the way it was, it would eventually crash and burn. More important: I would completely lose the drive and interest to continue the project. Because of this the decision was made to simplify the core by removing all side features like automatic installers and support for exotic platforms. This release (2.11.0) is the first real release that will reflect (parts) of these changes. As a result of this, some things might break. So before you continue make sure to backup your installation. Your config, your modules or better yet: your full MagicMirror folder. In other words: update at your own risk. +In the past years the project has grown a lot. This came with a huge downside: poor maintainability. If I let the project continue the way it was, it would eventually crash and burn. More important: I would completely lose the drive and interest to continue the project. Because of this the decision was made to simplify the core by removing all side features like automatic installers and support for exotic platforms. This release (2.11.0) is the first real release that will reflect (parts) of these changes. As a result of this, some things might break. So before you continue make sure to backup your installation. Your config, your modules or better yet: your full MagicMirror² folder. In other words: update at your own risk. For more information regarding this major change, please check issue [#1860](https://github.com/MichMich/MagicMirror/issues/1860). @@ -576,7 +576,7 @@ Fixed `package.json` version number. - Fixed unhandled error on bad git data in updatenotification module [#1285](https://github.com/MichMich/MagicMirror/issues/1285). - Weather forecast now works with openweathermap in new weather module. Daily data are displayed, see issue [#1504](https://github.com/MichMich/MagicMirror/issues/1504). - Fixed analogue clock border display issue where non-black backgrounds used (previous fix for issue 611) -- Fixed compatibility issues caused when modules request different versions of Font Awesome, see issue [#1522](https://github.com/MichMich/MagicMirror/issues/1522). MagicMirror now uses [Font Awesome 5 with v4 shims included for backwards compatibility](https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#shims). +- Fixed compatibility issues caused when modules request different versions of Font Awesome, see issue [#1522](https://github.com/MichMich/MagicMirror/issues/1522). MagicMirror² now uses [Font Awesome 5 with v4 shims included for backwards compatibility](https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#shims). - Installation script problems with raspbian - Calendar: only show repeating count if the event is actually repeating [#1534](https://github.com/MichMich/MagicMirror/pull/1534) - Calendar: Fix exdate handling when multiple values are specified (comma separated) @@ -688,7 +688,7 @@ A huge, huge, huge thanks to user @fewieden for all his hard work on the new `we ## [2.4.0] - 2018-07-01 -⚠️ **Warning:** This release includes an updated version of Electron. This requires a Raspberry Pi configuration change to allow the best performance and prevent the CPU from overheating. Please read the information on the [MagicMirror Wiki](https://github.com/michmich/magicmirror/wiki/configuring-the-raspberry-pi#enable-the-open-gl-driver-to-decrease-electrons-cpu-usage). +⚠️ **Warning:** This release includes an updated version of Electron. This requires a Raspberry Pi configuration change to allow the best performance and prevent the CPU from overheating. Please read the information on the [MagicMirror² Wiki](https://github.com/michmich/magicmirror/wiki/configuring-the-raspberry-pi#enable-the-open-gl-driver-to-decrease-electrons-cpu-usage). ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install` @@ -929,7 +929,7 @@ A huge, huge, huge thanks to user @fewieden for all his hard work on the new `we - Add use pm2 for manager process into Installer RaspberryPi script. - Russian Translation. - Afrikaans Translation. -- Add postinstall script to notify user that MagicMirror installed successfully despite warnings from NPM. +- Add postinstall script to notify user that MagicMirror² installed successfully despite warnings from NPM. - Init tests using mocha. - Option to use RegExp in Calendar's titleReplace. - Hungarian Translation. @@ -992,7 +992,7 @@ A huge, huge, huge thanks to user @fewieden for all his hard work on the new `we - Add VSCode IntelliSense support. - Module API: Add Visibility locking to module system. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules#visibility-locking) for more information. - Module API: Method to overwrite the module's header. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules#getheader) for more information. -- Module API: Option to define the minimum MagicMirror version to run a module. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules#requiresversion) for more information. +- Module API: Option to define the minimum MagicMirror² version to run a module. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules#requiresversion) for more information. - Calendar module now broadcasts the event list to all other modules using the notification system. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/calendar) for more information. - Possibility to use the calendar feed as the source for the weather (currentweather & weatherforecast) location data. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/weatherforecast) for more information. - Added option to show rain amount in the weatherforecast default module @@ -1139,6 +1139,6 @@ It includes (but is not limited to) the following features: ## [1.0.0] - 2014-02-16 -### Initial release of MagicMirror. +### Initial release of MagicMirror². This was part of the blogpost: [https://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the](https://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the) diff --git a/config/config.js.sample b/config/config.js.sample index 9ab4e659..a3460d6f 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -14,7 +14,7 @@ let config = { // - "0.0.0.0", "::" to listen on any interface // Default, when address config is left out or empty, is "localhost" port: 8080, - basePath: "/", // The URL path where MagicMirror is hosted. If you are using a Reverse proxy + basePath: "/", // The URL path where MagicMirror² is hosted. If you are using a Reverse proxy // you must set the sub path here. basePath must end with a / ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses // or add a specific IPv4 of 192.168.1.5 : diff --git a/fonts/package.json b/fonts/package.json index f763aefc..a971c399 100644 --- a/fonts/package.json +++ b/fonts/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror-fonts", - "description": "Package for fonts use by MagicMirror Core.", + "description": "Package for fonts use by MagicMirror² Core.", "repository": { "type": "git", "url": "git+https://github.com/MichMich/MagicMirror.git" diff --git a/js/app.js b/js/app.js index fe66b0ce..c3d6b214 100644 --- a/js/app.js +++ b/js/app.js @@ -37,7 +37,7 @@ if (process.env.MM_PORT) { process.on("uncaughtException", function (err) { Log.error("Whoops! There was an uncaught exception..."); Log.error(err); - Log.error("MagicMirror will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?"); + Log.error("MagicMirror² will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?"); Log.error("If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues"); }); @@ -128,7 +128,7 @@ function App() { let m = new Module(); if (m.requiresVersion) { - Log.log(`Check MagicMirror version for node helper '${moduleName}' - Minimum version: ${m.requiresVersion} - Current version: ${global.version}`); + Log.log(`Check MagicMirror² version for node helper '${moduleName}' - Minimum version: ${m.requiresVersion} - Current version: ${global.version}`); if (cmpVersions(global.version, m.requiresVersion) >= 0) { Log.log("Version is ok!"); } else { diff --git a/js/defaults.js b/js/defaults.js index 53f9c90d..a897077a 100644 --- a/js/defaults.js +++ b/js/defaults.js @@ -59,7 +59,7 @@ const defaults = { position: "middle_center", classes: "xsmall", config: { - text: "If you get this message while your config file is already created,
" + "it probably contains an error. To validate your config file run in your MagicMirror directory
" + "
npm run config:check
" + text: "If you get this message while your config file is already created,
" + "it probably contains an error. To validate your config file run in your MagicMirror² directory
" + "
npm run config:check
" } }, { diff --git a/js/main.js b/js/main.js index 8d1db9ea..9d3a50b3 100644 --- a/js/main.js +++ b/js/main.js @@ -480,7 +480,7 @@ const MM = (function () { * Main init method. */ init: function () { - Log.info("Initializing MagicMirror."); + Log.info("Initializing MagicMirror²."); loadConfig(); Log.setLogLevel(config.logLevel); diff --git a/js/module.js b/js/module.js index bb78c383..6d154529 100644 --- a/js/module.js +++ b/js/module.js @@ -12,7 +12,7 @@ const Module = Class.extend({ * All methods (and properties) below can be subclassed. * *********************************************************/ - // Set the minimum MagicMirror module version for this module. + // Set the minimum MagicMirror² module version for this module. requiresVersion: "2.0.0", // Module config defaults. @@ -434,7 +434,7 @@ const Module = Class.extend({ }); /** - * Merging MagicMirror (or other) default/config script by @bugsounet + * Merging MagicMirror² (or other) default/config script by @bugsounet * Merge 2 objects or/with array * * Usage: @@ -498,7 +498,7 @@ Module.create = function (name) { Module.register = function (name, moduleDefinition) { if (moduleDefinition.requiresVersion) { - Log.log("Check MagicMirror version for module '" + name + "' - Minimum version: " + moduleDefinition.requiresVersion + " - Current version: " + window.mmVersion); + Log.log("Check MagicMirror² version for module '" + name + "' - Minimum version: " + moduleDefinition.requiresVersion + " - Current version: " + window.mmVersion); if (cmpVersions(window.mmVersion, moduleDefinition.requiresVersion) >= 0) { Log.log("Version is ok!"); } else { diff --git a/js/node_helper.js b/js/node_helper.js index 067ae64a..8c2e2b90 100644 --- a/js/node_helper.js +++ b/js/node_helper.js @@ -23,7 +23,7 @@ const NodeHelper = Class.extend({ }, /* stop() - * Called when the MagicMirror server receives a `SIGINT` + * Called when the MagicMirror² server receives a `SIGINT` * Close any open connections, stop any sub-processes and * gracefully exit the module. * diff --git a/modules/default/alert/README.md b/modules/default/alert/README.md index 2e7973a3..720adae3 100644 --- a/modules/default/alert/README.md +++ b/modules/default/alert/README.md @@ -1,5 +1,5 @@ # Module: Alert -The alert module is one of the default modules of the MagicMirror. This module displays notifications from other modules. +The alert module is one of the default modules of the MagicMirror². This module displays notifications from other modules. For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/alert.html). diff --git a/modules/default/alert/translations/bg.json b/modules/default/alert/translations/bg.json index e97844c8..102a0b19 100644 --- a/modules/default/alert/translations/bg.json +++ b/modules/default/alert/translations/bg.json @@ -1,4 +1,4 @@ { - "sysTitle": "MagicMirror нотификация", + "sysTitle": "MagicMirror² нотификация", "welcome": "Добре дошли, стартирането беше успешно" } diff --git a/modules/default/alert/translations/da.json b/modules/default/alert/translations/da.json index f79a5011..406d2ff6 100644 --- a/modules/default/alert/translations/da.json +++ b/modules/default/alert/translations/da.json @@ -1,4 +1,4 @@ { - "sysTitle": "MagicMirror Notifikation", + "sysTitle": "MagicMirror² Notifikation", "welcome": "Velkommen, modulet er succesfuldt startet!" } diff --git a/modules/default/alert/translations/de.json b/modules/default/alert/translations/de.json index 6a0340f2..3ae5238c 100644 --- a/modules/default/alert/translations/de.json +++ b/modules/default/alert/translations/de.json @@ -1,4 +1,4 @@ { - "sysTitle": "MagicMirror Benachrichtigung", + "sysTitle": "MagicMirror² Benachrichtigung", "welcome": "Willkommen, Start war erfolgreich!" } diff --git a/modules/default/alert/translations/en.json b/modules/default/alert/translations/en.json index 9854d518..ea3319b9 100644 --- a/modules/default/alert/translations/en.json +++ b/modules/default/alert/translations/en.json @@ -1,4 +1,4 @@ { - "sysTitle": "MagicMirror Notification", + "sysTitle": "MagicMirror² Notification", "welcome": "Welcome, start was successful!" } diff --git a/modules/default/alert/translations/es.json b/modules/default/alert/translations/es.json index 84339233..a2f74722 100644 --- a/modules/default/alert/translations/es.json +++ b/modules/default/alert/translations/es.json @@ -1,4 +1,4 @@ { - "sysTitle": "MagicMirror Notificaciones", + "sysTitle": "MagicMirror² Notificaciones", "welcome": "Bienvenido, ¡se iniciado correctamente!" } diff --git a/modules/default/alert/translations/fr.json b/modules/default/alert/translations/fr.json index 6ed40c62..a6d3c105 100644 --- a/modules/default/alert/translations/fr.json +++ b/modules/default/alert/translations/fr.json @@ -1,4 +1,4 @@ { - "sysTitle": "MagicMirror Notification", + "sysTitle": "MagicMirror² Notification", "welcome": "Bienvenue, le démarrage a été un succès!" } diff --git a/modules/default/alert/translations/hu.json b/modules/default/alert/translations/hu.json index 332458b5..90ab35da 100644 --- a/modules/default/alert/translations/hu.json +++ b/modules/default/alert/translations/hu.json @@ -1,4 +1,4 @@ { - "sysTitle": "MagicMirror értesítés", + "sysTitle": "MagicMirror² értesítés", "welcome": "Üdvözöljük, indulás sikeres!" } diff --git a/modules/default/alert/translations/nl.json b/modules/default/alert/translations/nl.json index 39978191..59a480bd 100644 --- a/modules/default/alert/translations/nl.json +++ b/modules/default/alert/translations/nl.json @@ -1,4 +1,4 @@ { - "sysTitle": "MagicMirror Notificatie", + "sysTitle": "MagicMirror² Notificatie", "welcome": "Welkom, Succesvol gestart!" } diff --git a/modules/default/alert/translations/ru.json b/modules/default/alert/translations/ru.json index fe535c2d..4ddc86cb 100644 --- a/modules/default/alert/translations/ru.json +++ b/modules/default/alert/translations/ru.json @@ -1,4 +1,4 @@ { - "sysTitle": "MagicMirror Уведомление", + "sysTitle": "MagicMirror² Уведомление", "welcome": "Добро пожаловать, старт был успешным!" } diff --git a/modules/default/calendar/README.md b/modules/default/calendar/README.md index 3583aa18..15275958 100755 --- a/modules/default/calendar/README.md +++ b/modules/default/calendar/README.md @@ -1,6 +1,6 @@ # Module: Calendar -The `calendar` module is one of the default modules of the MagicMirror. +The `calendar` module is one of the default modules of the MagicMirror². This module displays events from a public .ical calendar. It can combine multiple calendars. For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/calendar.html). diff --git a/modules/default/calendar/debug.js b/modules/default/calendar/debug.js index f2d3a48e..08cd3770 100644 --- a/modules/default/calendar/debug.js +++ b/modules/default/calendar/debug.js @@ -1,6 +1,6 @@ /* CalendarFetcher Tester * use this script with `node debug.js` to test the fetcher without the need - * of starting the MagicMirror core. Adjust the values below to your desire. + * of starting the MagicMirror² core. Adjust the values below to your desire. * * By Michael Teeuw https://michaelteeuw.nl * MIT Licensed. diff --git a/modules/default/clock/README.md b/modules/default/clock/README.md index 30019e00..16703eb0 100644 --- a/modules/default/clock/README.md +++ b/modules/default/clock/README.md @@ -1,6 +1,6 @@ # Module: Clock -The `clock` module is one of the default modules of the MagicMirror. +The `clock` module is one of the default modules of the MagicMirror². This module displays the current date and time. The information will be updated realtime. For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/clock.html). diff --git a/modules/default/compliments/README.md b/modules/default/compliments/README.md index e1360f2e..57e105ff 100644 --- a/modules/default/compliments/README.md +++ b/modules/default/compliments/README.md @@ -1,6 +1,6 @@ # Module: Compliments -The `compliments` module is one of the default modules of the MagicMirror. +The `compliments` module is one of the default modules of the MagicMirror². This module displays a random compliment. For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/compliments.html). diff --git a/modules/default/helloworld/README.md b/modules/default/helloworld/README.md index 5d5d3a17..065d5f98 100644 --- a/modules/default/helloworld/README.md +++ b/modules/default/helloworld/README.md @@ -1,5 +1,5 @@ # Module: Hello World -The `helloworld` module is one of the default modules of the MagicMirror. It is a simple way to display a static text on the mirror. +The `helloworld` module is one of the default modules of the MagicMirror². It is a simple way to display a static text on the mirror. For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/helloworld.html). diff --git a/modules/default/newsfeed/README.md b/modules/default/newsfeed/README.md index 484fedba..0671f138 100644 --- a/modules/default/newsfeed/README.md +++ b/modules/default/newsfeed/README.md @@ -1,6 +1,6 @@ # Module: News Feed -The `newsfeed` module is one of the default modules of the MagicMirror. +The `newsfeed` module is one of the default modules of the MagicMirror². This module displays news headlines based on an RSS feed. Scrolling through news headlines happens time-based (`updateInterval`), but can also be controlled by sending news feed specific notifications to the module. For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/newsfeed.html). diff --git a/modules/default/updatenotification/README.md b/modules/default/updatenotification/README.md index 0ab6886a..d7003765 100644 --- a/modules/default/updatenotification/README.md +++ b/modules/default/updatenotification/README.md @@ -1,6 +1,6 @@ # Module: Update Notification -The `updatenotification` module is one of the default modules of the MagicMirror. -This will display a message whenever a new version of the MagicMirror application is available. +The `updatenotification` module is one of the default modules of the MagicMirror². +This will display a message whenever a new version of the MagicMirror² application is available. For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/updatenotification.html). diff --git a/modules/default/weather/providers/smhi.js b/modules/default/weather/providers/smhi.js index e01b0749..dea1f1b2 100644 --- a/modules/default/weather/providers/smhi.js +++ b/modules/default/weather/providers/smhi.js @@ -237,7 +237,7 @@ WeatherProvider.register("smhi", { }, /** - * Map the icon value from SMHI to an icon that MagicMirror understands. + * Map the icon value from SMHI to an icon that MagicMirror² understands. * Uses different icons depending if its daytime or nighttime. * SMHI's description of what the numeric value means is the comment after the case. * diff --git a/package.json b/package.json index f014ef58..563dd487 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "server": "node ./serveronly", "install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error", "install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error", - "postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"", + "postinstall": "npm run install-fonts && echo \"MagicMirror² installation finished successfully! \n\"", "test": "NODE_ENV=test jest -i --forceExit", "test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest -i --forceExit", "test:electron": "NODE_ENV=test jest --selectProjects electron -i --forceExit", diff --git a/tests/e2e/modules/basic-auth.js b/tests/e2e/modules/basic-auth.js index fc08ae40..9ace932b 100644 --- a/tests/e2e/modules/basic-auth.js +++ b/tests/e2e/modules/basic-auth.js @@ -4,7 +4,7 @@ const express = require("express"); const app = express(); const basicAuth = auth({ - realm: "MagicMirror Area restricted.", + realm: "MagicMirror² Area restricted.", users: { MagicMirror: "CallMeADog" } }); diff --git a/tests/e2e/without_modules.js b/tests/e2e/without_modules.js index 41320631..e60e2312 100644 --- a/tests/e2e/without_modules.js +++ b/tests/e2e/without_modules.js @@ -9,7 +9,7 @@ describe("Check configuration without modules", function () { helpers.stopApplication(); }); - it("Show the message MagicMirror title", function () { + it("Show the message MagicMirror² title", function () { helpers.waitForElement("#module_1_helloworld .module-content").then((elem) => { expect(elem).not.toBe(null); expect(elem.textContent).toContain("MagicMirror²"); diff --git a/translations/he.json b/translations/he.json index 038d0ed1..e066b59f 100644 --- a/translations/he.json +++ b/translations/he.json @@ -28,7 +28,7 @@ "FEELS": "מרגיש כמו {DEGREE}", "PRECIP": "משקעים", - "UPDATE_NOTIFICATION": "עדכון זמין ל-MagicMirror", + "UPDATE_NOTIFICATION": "עדכון זמין ל-MagicMirror²", "UPDATE_NOTIFICATION_MODULE": "עדכון זמין ב-{MODULE_NAME} מודול", "UPDATE_INFO_SINGLE": "ההתקנה הנוכחית נמצאת מאחור הענף {BRANCH_NAME} ב-{COMMIT_COUNT} מופע", "UPDATE_INFO_MULTIPLE": "ההתקנה הנוכחית נמצאת מאחור הענף {BRANCH_NAME} ב-{COMMIT_COUNT} מופעים" diff --git a/translations/pt-br.json b/translations/pt-br.json index 236b1f92..09de7887 100644 --- a/translations/pt-br.json +++ b/translations/pt-br.json @@ -26,7 +26,7 @@ "FEELS": "Percebida {DEGREE}", "PRECIP": "PoP", - "UPDATE_NOTIFICATION": "Nova atualização para MagicMirror disponível.", + "UPDATE_NOTIFICATION": "Nova atualização para MagicMirror² disponível.", "UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.", "UPDATE_INFO_SINGLE": "Sua versão atual é a {COMMIT_COUNT} commit dentro do seguinte branch {BRANCH_NAME}.", "UPDATE_INFO_MULTIPLE": "Sua versão atual é a {COMMIT_COUNT} commits dentro do seguinte branch {BRANCH_NAME}." diff --git a/vendor/package.json b/vendor/package.json index 312d0b8a..a45104ee 100755 --- a/vendor/package.json +++ b/vendor/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror-vendors", - "description": "Package for vendors use by MagicMirror Core.", + "description": "Package for vendors use by MagicMirror² Core.", "repository": { "type": "git", "url": "git+https://github.com/MichMich/MagicMirror.git" From be22309e4528a92b3ab63132e9f08670535ded32 Mon Sep 17 00:00:00 2001 From: Kristjan SCHMIDT <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Wed, 26 Jan 2022 23:54:20 +0100 Subject: [PATCH 4/4] =?UTF-8?q?Undo=20minor=20change:=20Version=201.0.0=20?= =?UTF-8?q?wasn't=20MagicMirror=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71c438f0..63710cf9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1139,6 +1139,6 @@ It includes (but is not limited to) the following features: ## [1.0.0] - 2014-02-16 -### Initial release of MagicMirror². +### Initial release of MagicMirror This was part of the blogpost: [https://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the](https://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the)