diff options
| -rw-r--r-- | docs/guides/FAQ.rst | 4 | ||||
| -rw-r--r-- | docs/guides/desktop.rst | 5 | ||||
| -rw-r--r-- | electron_js/main.js | 8 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | www/lang/locale-de.json | 2 |
5 files changed, 21 insertions, 2 deletions
diff --git a/docs/guides/FAQ.rst b/docs/guides/FAQ.rst index 4f861fae..d7d10548 100644 --- a/docs/guides/FAQ.rst +++ b/docs/guides/FAQ.rst @@ -746,6 +746,10 @@ push notifications, it checks if the last time a push was sent for this monitor is < the time you specified. If it is, it does not send. That's all. +When I switch languages, date/time inputs don't follow my locale in zmNinja Desktop +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +The only screen I am aware of where there is a date/time input is ``Events->Filter Events``. This happens because the desktop version uses an embedded chromium version which seems to default to ``en-us``. To work around this, you can start the desktop app with a ``--lang='<locale code>'`` option. Example ``--lang='ru'``. Note that you will have to do this each time and is completely related to any language you may choose in zmNinja. Thel language in zmNinja is only used to translate text strings. Nothing else. For an extended discussion see `this issue <https://github.com/pliablepixels/zmNinja/issues/875>`__. + Is zmNinja free? ---------------- diff --git a/docs/guides/desktop.rst b/docs/guides/desktop.rst index 0afcdacf..21fd7df0 100644 --- a/docs/guides/desktop.rst +++ b/docs/guides/desktop.rst @@ -19,6 +19,11 @@ The following command line parameters are supported: --fs - starts zmNinja in full screen mode + --lang - specifies a language profile that will be used to display input + dates etc. Just switching a "language" in zmNinja does not affect browser + default language. I currently don't know how to wire this to zmNinja's language + as this is electron stuff so you'll have to pass it as command line. + Multiple instances ------------------ diff --git a/electron_js/main.js b/electron_js/main.js index 4b2a2c1e..50d86d89 100644 --- a/electron_js/main.js +++ b/electron_js/main.js @@ -22,6 +22,10 @@ if (argv.path) { console.log ("switching storage to: "+app.getPath("userData")); } +if (argv.lang) { + console.log ('SET LANGUAGE TO '+argv.lang) + app.commandLine.appendSwitch('lang', argv.lang); +} // @@ -30,6 +34,7 @@ if (argv.path) { let win; app.commandLine.appendSwitch ('ignore-certificate-errors', 'true'); + const gotTheLock = app.requestSingleInstanceLock() if (!gotTheLock) { @@ -128,6 +133,9 @@ function createWindow() { }); mainWindowState.manage(win); + + + // fs will be arg 1 if its not run in electron debug mode if (argv.fs) { diff --git a/package.json b/package.json index 71a43996..09bb7baa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.3.085", + "version":"1.3.085", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -192,4 +192,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/www/lang/locale-de.json b/www/lang/locale-de.json index 4771d3d8..3fdf9846 100644 --- a/www/lang/locale-de.json +++ b/www/lang/locale-de.json @@ -49,6 +49,7 @@ "kCredentialsBody" :"Bitte ZoneMinder Zugangsdaten eingeben", "kCredentialsTitle" :"Zugangsdaten erforderlich", "kCurrentState" :"Aktueller Status", + "kCustomId" :"benutzerdefinierte ID", "kCustomRange" :"benutzerdefinierter Zeitraum", "kCycleMonitors" :"Kameras durchwechseln", "kCycleMonitorsInterval" :"Durchwechselintervall Kameras", @@ -177,6 +178,7 @@ "kKioskPasswordConfirm" :"Gebe das Passwort für die Kioskmodus erneut ein", "kLanguage" :"Sprache", "kLatestEvents" :"neuste Ereignisse", + "kLiveStreamBuffer" :"Puffer Livebild", "kLiveView" :"Livebild", "kLoad" :"Auslastung", "kLoading" :"lade", |