Merge pull request #4 from nightscout/dev

Dev

CONTRIBUTING.md

@@ -95,10 +95,8 @@ appropriate.
 
 ## Co-ordination
 
-There is a google groups nightscout-core developers list where lots of
-people discuss Nightscout.  Most cgm-remote-monitor hackers use
-github's ticketing system, along with Facebook cgm-in-the-cloud, and
-gitter system.
+Most cgm-remote-monitor hackers use github's ticketing system, along with Facebook cgm-in-the-cloud, and
+gitter.
 
 We use git-flow, with `master` as our production, stable branch, and
 `dev` is used to queue up for upcoming releases.  Everything else is

lib/client/index.js

@@ -526,26 +526,28 @@ client.init = function init(serverSettings, plugins) {
 
     silenceTime = silenceTime || times.mins(5).msecs;
 
-    if (notify) {
-      if (notify.group === 'Time Ago') {
-        container.removeClass('alarming-timeago');
-      }
+    var alarm = null;
 
-      var alarm = null;
+    if (notify) {
       if (notify.level) {
         alarm = getClientAlarm(notify.level, notify.group);
       } else if (notify.group) {
         alarm = getClientAlarm(currentNotify.level, notify.group);
       } else {
         alarm = getClientAlarm(currentNotify.level, currentNotify.group);
       }
+    } else if (currentNotify) {
+      alarm = getClientAlarm(currentNotify.level, currentNotify.group);
+    }
 
-      if (alarm) {
-        alarm.lastAckTime = Date.now();
-        alarm.silenceTime = silenceTime;
-      } else {
-        console.info('No alarm to ack for', notify || currentNotify);
+    if (alarm) {
+      alarm.lastAckTime = Date.now();
+      alarm.silenceTime = silenceTime;
+      if (alarm.group === 'Time Ago') {
+        container.removeClass('alarming-timeago');
       }
+    } else {
+      console.info('No alarm to ack for', notify || currentNotify);
     }
 
     // only emit ack if client invoke by button press

lib/language.js

@@ -5591,7 +5591,7 @@ function init() {
       cs: 'Portál ošetření'
       ,sv: 'Care Portal'
       ,it: 'Somministrazioni'
-      ,de: 'Betreuungs-Portal'
+      ,de: 'Behandlungs-Portal'
       ,ro: 'Care Portal'
       ,bg: 'Въвеждане на данни'
       ,nb: 'Omsorgsportal'
@@ -7126,6 +7126,7 @@ function init() {
       ,de: 'Pumpe'
       ,bg: 'Помпа'
       ,ro: 'Pompă'
+      ,ru: 'Помпа'
       ,nl: 'Pomp'
       ,ko: '펌프'
       }
@@ -7137,6 +7138,7 @@ function init() {
       ,de: 'Sensor-Alter'
       ,bg: 'Възраст на сензора'
       ,ro: 'Vechimea senzorului'
+      ,ru: 'Возраст сенсора'
       ,nl: 'Sensor leeftijd'
       ,ko: '센서 사용 기간'
       }
@@ -7148,6 +7150,7 @@ function init() {
       ,de: 'Insulin-Alter'
       ,bg: 'Възраст на инсулина'
       ,ro: 'Vechimea insulinei'
+      ,ru: 'Возраст инсулина'
       ,nl: 'Insuline leeftijd'
       ,ko: '인슐린 사용 기간'
       }
@@ -7159,6 +7162,7 @@ function init() {
       ,de: 'Temporäres Ziel'
       ,bg: 'Временни граници'
       ,ro: 'Țintă temporară'
+      ,ru: 'Временная цель'
       ,nl: 'Tijdelijk doel'
       ,ko: '임시 목표'
       }
@@ -7171,6 +7175,7 @@ function init() {
       ,bg: 'Причина'
       ,nl: 'Reden'
       ,ro: 'Motiv'
+      ,ru: 'Причина'
       ,ko: '근거'
       }
     ,'Eating soon' : {
@@ -7181,6 +7186,7 @@ function init() {
       ,de: 'Bald essend'
       ,bg: 'Ядене скоро'
       ,ro: 'Mâncare în curând'
+      ,ru: 'Скоро еда'
       ,nl: 'Binnenkort eten'
       ,ko: '곧 편집 중'
       }
@@ -7192,6 +7198,7 @@ function init() {
       ,de: 'Oben'
       ,bg: 'Горе'
       ,ro: 'Deasupra'
+      ,ru: 'Верх'
       ,nl: 'Boven'
       ,ko: '최고'
       }
@@ -7203,6 +7210,7 @@ function init() {
       ,de: 'Unten'
       ,bg: 'Долу'
       ,ro: 'Sub'
+      ,ru: 'Низ'
       ,nl: 'Beneden'
       ,ko: '최저'
       }
@@ -7214,6 +7222,7 @@ function init() {
       ,de: 'Aktivität'
       ,bg: 'Активност'
       ,ro: 'Activitate'
+      ,ru: 'Активность'
       ,nl: 'Activiteit'
       ,ko: '활동량'
       }
@@ -7225,37 +7234,44 @@ function init() {
       ,nb: 'Mål'
       ,bg: 'Граници'
       ,ro: 'Ținte'
+      ,ru: 'Цели'
       ,nl: 'Doelen'
       ,ko: '목표'
       }
     ,'Bolus insulin:' : {
       cs:'Bolusový inzulín:'
       ,ro: 'Insulină bolusată:'
+      ,ru: 'Болюс инсулин'
       ,ko: 'Bolus 인슐린'
       }
     ,'Base basal insulin:' : {
       cs:'Základní bazální inzulín:'
       ,ro: 'Bazala obișnuită:'
+      ,ru: 'Основной базал инсулин'
       ,ko: '기본 basal 인슐린'
       }
     ,'Positive temp basal insulin:' : {
       cs:'Pozitivní dočasný bazální inzulín:'
       ,ro: 'Bazala temporară crescută:'
+      ,ru: 'Положит знач временн базал инс '
       ,ko: '임시 basal 인슐린 남아 있습니다.'
       }
     ,'Negative temp basal insulin:' : {
       cs:'Negativní dočasný bazální inzulín:'
       ,ro: 'Bazala temporară scăzută:'
+      ,ru: 'Отриц знач временн базал инс'
       ,ko: '임시 basal 인슐린 남아 있지 않습니다.'
       }
     ,'Total basal insulin:' : {
       cs:'Celkový bazální inzulín:'
       ,ro: 'Bazala totală:'
+      ,ru: 'Всего базал инсулина'
       ,ko: '전체 basal 인슐린'
       }
     ,'Total daily insulin:' : {
       cs:'Celkový denní inzulín:'
       ,ro: 'Insulina totală zilnică:'
+      ,ru: 'Всего ежедн базал инсулина'
       ,ko: '전체 하루 인슐린'
       }
 

static/api-docs.html

@@ -38,6 +38,7 @@
   <script src='/bower_components/swagger-ui/dist/lib/backbone-min.js' type='text/javascript'></script>
   <script src='/bower_components/swagger-ui/dist/swagger-ui.js' type='text/javascript'></script>
   <script src='/bower_components/swagger-ui/dist/lib/highlight.7.3.pack.js' type='text/javascript'></script>
+  <script src='/bower_components/swagger-ui/dist/lib/jsoneditor.min.js' type='text/javascript'></script>
   <script src='/bower_components/swagger-ui/dist/lib/marked.js' type='text/javascript'></script>
   <script src='/bower_components/swagger-ui/dist/lib/swagger-oauth.js' type='text/javascript'></script>