mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-07-04 14:47:20 +00:00
Merge branch 'develop' into develop
This commit is contained in:
Michael Teeuw
GitHub
commit
89c9d4dfc4
22
CHANGELOG.md
22
CHANGELOG.md
@ -3,30 +3,24 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
This project adheres to [Semantic Versioning](http://semver.org/).
|
||||
|
||||
❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror² core.
|
||||
|
||||
## [2.12.0] - 2020-01-31
|
||||
|
||||
### Changed
|
||||
- Add HTTPS support and update config.js.sample
|
||||
|
||||
## [2.11.0] - 2020-01-24
|
||||
|
||||
### Changed
|
||||
- Updated config.js.sample: Corrected some grammar on `config.js.sample` comment section.
|
||||
❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror²
|
||||
|
||||
## [2.11.0] - Unreleased (Develop Branch)
|
||||
|
||||
*This release is scheduled to be released on 2020-04-01.*
|
||||
|
||||
### Deleted
|
||||
- cleanup installers folder, remove externalized scripts
|
||||
- Remove installers.
|
||||
- Remove externalized scripts.
|
||||
|
||||
### Added
|
||||
- Ukrainian translation.
|
||||
- Finnish translation for "PRECIP", "UPDATE_INFO_MULTIPLE" and "UPDATE_INFO_SINGLE".
|
||||
- Added the ability to hide the temp label and weather icon in the `currentweather` module to allow showing only information such as wind and sunset/rise.
|
||||
- The `clock` module now optionally displays sun and moon data, including rise/set times, remaining daylight, and percent of moon illumination.
|
||||
- Added Hebrew translation.
|
||||
- Add HTTPS support and update config.js.sample
|
||||
|
||||
|
||||
### Fixed
|
||||
- Force declaration of public ip adress in config file (ISSUE #1852)
|
||||
@ -36,6 +30,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
||||
|
||||
### Updated
|
||||
- Remove documentation from core repository and link to new dedicated docs site: [docs.magicmirror.builders](https://docs.magicmirror.builders).
|
||||
- Updated config.js.sample: Corrected some grammar on `config.js.sample` comment section.
|
||||
- Removed `run-start.sh` script and update start commands:
|
||||
- To start using electron, use `npm run start`.
|
||||
- To start in server only mode, use `npm run server`.
|
||||
|
||||
## [2.10.1] - 2020-01-10
|
||||
|
||||
|
||||
3
installers/mm.sh
Executable file
3
installers/mm.sh
Executable file
@ -0,0 +1,3 @@
|
||||
# This file is still here to keep PM2 working on older installations.
|
||||
cd ~/MagicMirror
|
||||
DISPLAY=:0 npm start
|
||||
@ -1,7 +0,0 @@
|
||||
{
|
||||
"apps" : [{
|
||||
"name" : "MagicMirror",
|
||||
"script" : "/home/pi/MagicMirror/installers/mm.sh",
|
||||
"watch" : ["/home/pi/MagicMirror/config/config.js"]
|
||||
}]
|
||||
}
|
||||
@ -1,2 +0,0 @@
|
||||
echo "\033[32mMagicMirror installation successful!"
|
||||
exit 0
|
||||
@ -4,7 +4,6 @@
|
||||
* By Michael Teeuw http://michaelteeuw.nl
|
||||
* MIT Licensed.
|
||||
*/
|
||||
|
||||
var fs = require("fs");
|
||||
var Server = require(__dirname + "/server.js");
|
||||
var Utils = require(__dirname + "/utils.js");
|
||||
|
||||
@ -28,7 +28,7 @@ var rrule = require('rrule').RRule
|
||||
|
||||
function getLocaleISOString(date) {
|
||||
var year = date.getFullYear().toString(10).padStart(4,'0');
|
||||
var month = date.getMonth().toString(10).padStart(2,'0');
|
||||
var month = (date.getMonth() + 1).toString(10).padStart(2,'0');
|
||||
var day = date.getDate().toString(10).padStart(2,'0');
|
||||
var hour = date.getHours().toString(10).padStart(2,'0');
|
||||
var minute = date.getMinutes().toString(10).padStart(2,'0');
|
||||
|
||||
@ -4,10 +4,11 @@
|
||||
"description": "The open source modular smart mirror platform.",
|
||||
"main": "js/electron.js",
|
||||
"scripts": {
|
||||
"start": "./run-start.sh",
|
||||
"install": "cd vendor && npm install",
|
||||
"install-fonts": "cd fonts && npm install",
|
||||
"postinstall": "sh untrack-css.sh && sh installers/postinstall/postinstall.sh && npm run install-fonts",
|
||||
"start": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js",
|
||||
"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\"",
|
||||
"test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive",
|
||||
"test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive",
|
||||
"test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive",
|
||||
|
||||
75
run-start.sh
75
run-start.sh
@ -1,75 +0,0 @@
|
||||
#!/bin/bash
|
||||
# use bash instead of sh
|
||||
./untrack-css.sh
|
||||
|
||||
if grep docker /proc/1/cgroup -qa; then
|
||||
# if running in docker, only start electron
|
||||
|
||||
electron js/electron.js $1;
|
||||
else
|
||||
# not running in docker
|
||||
|
||||
if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty
|
||||
export DISPLAY=:0 # Set by default display
|
||||
fi
|
||||
# get the processor architecture
|
||||
arch=$(uname -m)
|
||||
false='false'
|
||||
|
||||
# get the config option, if any
|
||||
# only check non comment lines
|
||||
serveronly=$(grep -v '^\s//' config/config.js | grep -i serveronly: | awk '{print tolower($2)}' | tr -d ,\"\')
|
||||
# set default if not defined in config
|
||||
serveronly=${serveronly:-false}
|
||||
# check for xwindows running
|
||||
xorg=$(pgrep Xorg)
|
||||
#check for macOS
|
||||
mac=$(uname)
|
||||
#
|
||||
# if the user requested serveronly OR
|
||||
# electron support for armv6l has been dropped OR
|
||||
# system is in text mode
|
||||
#
|
||||
if [ "$serveronly." != "false." -o "$arch" == "armv6l" ] || [ "$xorg." == "." -a $mac != 'Darwin' ]; then
|
||||
|
||||
# if user explicitly configured to run server only (no ui local)
|
||||
# OR there is no xwindows running, so no support for browser graphics
|
||||
if [ "$serveronly." == "true." -o "$xorg." == "." ]; then
|
||||
# start server mode,
|
||||
node serveronly
|
||||
else
|
||||
# start the server in the background
|
||||
# wait for server to be ready
|
||||
# need bash for this
|
||||
exec 3< <(node serveronly)
|
||||
|
||||
# Read the output of server line by line until one line 'point your browser'
|
||||
while read line; do
|
||||
case "$line" in
|
||||
*point\ your\ browser*)
|
||||
echo $line
|
||||
break
|
||||
;;
|
||||
*)
|
||||
echo $line
|
||||
#sleep .25
|
||||
;;
|
||||
esac
|
||||
done <&3
|
||||
|
||||
# Close the file descriptor
|
||||
exec 3<&-
|
||||
|
||||
# lets use chrome to display here now
|
||||
# get the server port address from the ready message
|
||||
port=$(echo $line | awk -F\: '{print $4}')
|
||||
# start chromium
|
||||
echo "Starting chromium browser now, have patience, it takes a minute"
|
||||
chromium-browser -noerrdialogs -kiosk -start_maximized --disable-infobars --app=http://localhost:$port --ignore-certificate-errors-spki-list --ignore-ssl-errors --ignore-certificate-errors 2>/dev/null
|
||||
exit
|
||||
fi
|
||||
else
|
||||
# we can use electron directly
|
||||
electron js/electron.js $1;
|
||||
fi
|
||||
fi
|
||||
@ -42,7 +42,8 @@ var translations = {
|
||||
"sk" : "translations/sk.json", // Slovak
|
||||
"tlh" : "translations/tlh.json", // Klingon
|
||||
"ms-my" : "translations/ms-my.json", // Malay
|
||||
"he" : "translations/he.json" // Hebrew
|
||||
"he" : "translations/he.json", // Hebrew
|
||||
"uk" : "translations/uk.json" // Ukrainian
|
||||
};
|
||||
|
||||
if (typeof module !== "undefined") {module.exports = translations;}
|
||||
|
||||
36
translations/uk.json
Normal file
36
translations/uk.json
Normal file
@ -0,0 +1,36 @@
|
||||
{
|
||||
"LOADING": "Завантаження …",
|
||||
|
||||
"TODAY": "Сьогодні",
|
||||
"TOMORROW": "Завтра",
|
||||
"DAYAFTERTOMORROW": "Післязавтра",
|
||||
"RUNNING": "Закінчується через",
|
||||
"EMPTY": "Немає найближчих подій",
|
||||
|
||||
"WEEK": "Тиждень {weekNumber}",
|
||||
|
||||
"N": "Пн",
|
||||
"NNE": "ПнПнСх",
|
||||
"NE": "ПнСх",
|
||||
"ENE": "СхПнСх",
|
||||
"E": "Сх",
|
||||
"ESE": "СхПдСх",
|
||||
"SE": "СхПд",
|
||||
"SSE": "СхСхПд",
|
||||
"S": "Пд",
|
||||
"SSW": "ПдПдЗх",
|
||||
"SW": "ПдЗх",
|
||||
"WSW": "ЗхПдЗх",
|
||||
"W": "Зх",
|
||||
"WNW": "ЗхПнЗх",
|
||||
"NW": "ПнЗх",
|
||||
"NNW": "ПнПнЗх",
|
||||
|
||||
"UPDATE_NOTIFICATION": "Є оновлення для MagicMirror².",
|
||||
"UPDATE_NOTIFICATION_MODULE": "Є оновлення для модуля {MODULE_NAME}.",
|
||||
"UPDATE_INFO_SINGLE": "Поточна версія на {COMMIT_COUNT} комміт позаду від гілки {BRANCH_NAME}.",
|
||||
"UPDATE_INFO_MULTIPLE": "Поточна інсталяція на {COMMIT_COUNT} комітів позаду від гілки {BRANCH_NAME}.",
|
||||
|
||||
"FEELS": "Відчувається як",
|
||||
"PRECIP": "Опади"
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
# Long history here
|
||||
# https://github.com/MichMich/MagicMirror/pull/1540
|
||||
STATUS_CUSTOM_CSS=$(git ls-files -v css/custom.css| awk '{print $1}')
|
||||
|
||||
if [ "$STATUS_CUSTOM_CSS" = "H" ]; then
|
||||
echo "We'll remove from the repository the css/custom.css"
|
||||
echo "This script apply git update-index --skip-worktree css/custom.css"
|
||||
git update-index --skip-worktree css/custom.css
|
||||
git rm --cached css/custom.css
|
||||
fi
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user