From fe7204dbd5e3ea2d512785c9aed6b50d22f90f48 Mon Sep 17 00:00:00 2001 From: PieterGit Date: Thu, 19 Jul 2018 01:49:49 +0200 Subject: [PATCH 1/7] Fix Warning, Pump Battery Low Alarm cannot be disabled --- lib/client/browser-settings.js | 1 + lib/language.js | 12 +++++++++--- lib/settings.js | 1 + views/index.html | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/client/browser-settings.js b/lib/client/browser-settings.js index fab5dafbd505..bfac4df80676 100644 --- a/lib/client/browser-settings.js +++ b/lib/client/browser-settings.js @@ -36,6 +36,7 @@ function init (client, serverSettings, $) { $('#alarm-timeagowarnmins-browser').val(settings.alarmTimeagoWarnMins); $('#alarm-timeagourgent-browser').prop('checked', settings.alarmTimeagoUrgent); $('#alarm-timeagourgentmins-browser').val(settings.alarmTimeagoUrgentMins); + $('#alarm-pumpbatterylow-browser').prop('checked', settings.alarmPumpBatteryLow); $('#nightmode-browser').prop('checked', settings.nightMode); $('#editmode-browser').prop('checked', settings.editMode); diff --git a/lib/language.js b/lib/language.js index 0104d82f804f..d18d4b7dd864 100644 --- a/lib/language.js +++ b/lib/language.js @@ -1306,6 +1306,9 @@ function init() { ,ko: '시간 통계' ,zh_cn: '每小时状态' } + ,'netIOB stats': { // hourlystats + nl: 'netIOB stats' + } ,'Weekly success' : { cs: 'Statistika po týdnech' ,de: 'Wöchentlicher Erfolg' @@ -5138,6 +5141,9 @@ function init() { ,zh_cn: '启用报警' ,zh_tw: '啟用報警' } + ,"Pump Battery Low Alarm" : { + nl: "Battery pomp bijna leeg Alarm" + } ,'When enabled an alarm may sound.' : { cs: 'Při povoleném alarmu zní zvuk' ,de: 'Sofern eingeschaltet ertönt ein Alarm' @@ -5253,7 +5259,7 @@ function init() { ,pl: 'Uwaga: Alarm hipoglikemii' ,ru: 'Внимание: низкая гликемия' ,sk: 'Naliehavý alarm nízkej glykémie' - ,nl: 'Urgent alarm lage BG' + ,nl: 'Urgent Alarm lage BG' ,ko: '긴급 저혈당 알람' ,zh_cn: '血糖过低报警' ,zh_tw: '血糖過低報警' @@ -5276,7 +5282,7 @@ function init() { ,pl: 'Ostrzeżenie: brak odczytów' ,ru: 'Предупреждение: старые данные' ,sk: 'Varovanie: Zastaralé dáta' - ,nl: 'Gegevens verouderd: Waarschuwing' + ,nl: 'Waarschuwing Oude gegevens na' ,ko: '손실 데이터 : 경고' ,zh_cn: '数据过期：提醒' ,zh_tw: '數據過期：提醒' @@ -5299,7 +5305,7 @@ function init() { ,pl: 'Uwaga: brak odczytów' ,ru: 'Внимание: старые данные' ,sk: 'Naliehavé: Zastaralé dáta' - ,nl: 'URGENT Gegevens verouderd' + ,nl: 'Urgente Waarschuwing Oude gegevens na' ,ko: '손실 데이터 : 긴급' ,zh_cn: '数据过期：警告' ,zh_tw: '數據過期：警告' diff --git a/lib/settings.js b/lib/settings.js index f7d6367d69c4..ae5ce30e4843 100644 --- a/lib/settings.js +++ b/lib/settings.js @@ -27,6 +27,7 @@ function init ( ) { , alarmTimeagoWarnMins: 15 , alarmTimeagoUrgent: true , alarmTimeagoUrgentMins: 30 + , alarmPumpBatteryLow: false , language: 'en' , scaleY: 'log' , showPlugins: '' diff --git a/views/index.html b/views/index.html index 357bde549587..cb0d9dab1fa2 100644 --- a/views/index.html +++ b/views/index.html @@ -232,6 +232,7 @@ mins +
Night Mode
From 1097aafa0478478c12b06cb2fc396c03290abf7c Mon Sep 17 00:00:00 2001 From: PieterGit Date: Thu, 19 Jul 2018 02:32:06 +0200 Subject: [PATCH 2/7] fix Clock Views language.js --- lib/language.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/language.js b/lib/language.js index d18d4b7dd864..86ed2c020add 100644 --- a/lib/language.js +++ b/lib/language.js @@ -11473,7 +11473,7 @@ function init() { ,nl: 'Energie [kJ]' ,sv: 'Energi [kJ]' }, - 'Clock View': { + 'Clock Views': { cs: 'Hodiny' ,fi: 'Kellonäkymä' ,nl: 'Klokweergave' From 214844da004aee9b901a173fec251f47394bfa8c Mon Sep 17 00:00:00 2001 From: PieterGit Date: Thu, 19 Jul 2018 02:41:11 +0200 Subject: [PATCH 3/7] see if this will solve the problems with the speech plugin detection at the client --- lib/client/index.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/client/index.js b/lib/client/index.js index aedc7036f6d6..2eeab54ffbfe 100644 --- a/lib/client/index.js +++ b/lib/client/index.js @@ -596,13 +596,15 @@ client.load = function load(serverSettings, callback) { playAlarm(audio); $(this).addClass('playing'); }); - - var speechPlugin = client.plugins.enabledPlugins['speech']; - - if (speechPlugin) { - speechPlugin.say(alarmMessage); + + var speechEnabled = client.plugins.isEnabled('speech') ; + if (speechEnabled) { + var speechPlugin = client.plugins.enabledPlugins['speech']; + if (speechPlugin) { + speechPlugin.say(alarmMessage); + } } - + } container.addClass('alarming').addClass(file === urgentAlarmSound ? 'urgent' : 'warning'); From 4f06927981dcf48b03e4f093578f085291231e36 Mon Sep 17 00:00:00 2001 From: PieterGit Date: Thu, 19 Jul 2018 02:46:26 +0200 Subject: [PATCH 4/7] fix dutch spelling --- lib/language.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/language.js b/lib/language.js index 86ed2c020add..cac2866e9fb0 100644 --- a/lib/language.js +++ b/lib/language.js @@ -5142,7 +5142,7 @@ function init() { ,zh_tw: '啟用報警' } ,"Pump Battery Low Alarm" : { - nl: "Battery pomp bijna leeg Alarm" + nl: "Pompbatterij bijna leeg Alarm" } ,'When enabled an alarm may sound.' : { cs: 'Při povoleném alarmu zní zvuk' From 7f125a0e7f68596e14bd00c9e6e88e85b63561c6 Mon Sep 17 00:00:00 2001 From: PieterGit Date: Thu, 19 Jul 2018 08:48:11 +0200 Subject: [PATCH 5/7] translate Clock Views: --- lib/language.js | 20 ++++++++++---------- views/index.html | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/language.js b/lib/language.js index cac2866e9fb0..f6daa2d8edcf 100644 --- a/lib/language.js +++ b/lib/language.js @@ -11473,16 +11473,16 @@ function init() { ,nl: 'Energie [kJ]' ,sv: 'Energi [kJ]' }, - 'Clock Views': { - cs: 'Hodiny' - ,fi: 'Kellonäkymä' - ,nl: 'Klokweergave' - ,es: 'Vista del reloj' - ,fr: 'Vue Horloge' - ,ro: 'Vedere tip ceas' - ,ru: 'цифры крупно' - ,it: 'Vista orologio' - ,sv: 'Visa klocka' + 'Clock Views:': { + cs: 'Hodiny:' + ,fi: 'Kellonäkymä:' + ,nl: 'Klokweergave:' + ,es: 'Vista del reloj:' + ,fr: 'Vue Horloge:' + ,ro: 'Vedere tip ceas:' + ,ru: 'цифры крупно:' + ,it: 'Vista orologio:' + ,sv: 'Visa klocka:' }, 'Clock': { fr: 'L\'horloge' diff --git a/views/index.html b/views/index.html index cb0d9dab1fa2..6a0237f0983b 100644 --- a/views/index.html +++ b/views/index.html @@ -171,7 +171,7 @@
  • Food Editor
  • Admin Tools
  • - Clock Views: + Clock Views: Clock Color Simple From dc965ef474215cdc175d9c82a38e60acc2d10c27 Mon Sep 17 00:00:00 2001 From: PieterGit Date: Thu, 19 Jul 2018 08:50:10 +0200 Subject: [PATCH 6/7] disable again --- lib/client/index.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/client/index.js b/lib/client/index.js index 2eeab54ffbfe..c688a0ce0466 100644 --- a/lib/client/index.js +++ b/lib/client/index.js @@ -597,13 +597,14 @@ client.load = function load(serverSettings, callback) { $(this).addClass('playing'); }); - var speechEnabled = client.plugins.isEnabled('speech') ; - if (speechEnabled) { - var speechPlugin = client.plugins.enabledPlugins['speech']; - if (speechPlugin) { - speechPlugin.say(alarmMessage); - } - } + //TODO: temporary disabled becaused it throws Uncaught TypeError: Cannot read property 'speech' of undefined if speech is not in ENABLE, https://github.com/nightscout/cgm-remote-monitor/pull/3709 + //var speechEnabled = client.plugins.isEnabled('speech') ; + //if (speechEnabled) { + // var speechPlugin = client.plugins.enabledPlugins['speech']; + // if (speechPlugin) { + // speechPlugin.say(alarmMessage); + // } + //} } From fd615fd468060a72ca458298a7ce319cb37585bc Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Thu, 26 Jul 2018 10:54:52 +0300 Subject: [PATCH 7/7] Update language.js --- lib/language.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/language.js b/lib/language.js index 460f115c1e2e..e1e325d9f7fa 100644 --- a/lib/language.js +++ b/lib/language.js @@ -11543,6 +11543,7 @@ function init() { ,nl: 'Klok' ,sv: 'Klocka' ,de: 'Uhr' + }, 'Color': { fr: 'Couleur' ,nl: 'Kleur' @@ -11666,4 +11667,4 @@ function init() { return language(); } -module.exports = init; \ No newline at end of file +module.exports = init;