Merge pull request #4 from nightscout/dev

Dev
wagnerpe · Oct 16, 2016 · c6aef93 · c6aef93
2 parents 6694971 + cf2ad00
commit c6aef93
Show file tree

Hide file tree

Showing 42 changed files with 576 additions and 232 deletions.
diff --git a/azuredeploy.json b/azuredeploy.json
@@ -77,6 +77,7 @@
         "cs",
         "dk",
         "de",
+        "el",
         "en",
         "es",
         "fr",
@@ -313,4 +314,4 @@
       }
     }]
   }]
-}
+}
diff --git a/bundle/bundle.source.js b/bundle/bundle.source.js
@@ -11,7 +11,6 @@
   window.Nightscout = {
     client: require('../lib/client')
     , units: require('../lib/units')()
-    , plugins: require('../lib/plugins/')().registerClientDefaults()
     , report_plugins: require('../lib/report_plugins/')()
     , admin_plugins: require('../lib/admin_plugins/')()
   };

diff --git a/lib/admin_plugins/roles.js b/lib/admin_plugins/roles.js
@@ -43,8 +43,8 @@ function createOrSaveRole (role, client, callback) {
   }).done(function success() {
     reload(client, callback);
   }).fail(function fail(err) {
-    console.error('Unable to ' + method + ' Subject', err.responseText);
-    window.alert(client.translate('Unable to ' + method + ' Subject'));
+    console.error('Unable to ' + method + ' Role', err.responseText);
+    window.alert(client.translate('Unable to %1 Role', { params: [method] }));
     if (callback) {
       callback(err);
     }
@@ -59,8 +59,8 @@ function deleteRole (role, client, callback) {
   }).done(function success() {
     reload(client, callback);
   }).fail(function fail(err) {
-    console.error('Unable to delete Subject', err.responseText);
-    window.alert(client.translate('Unable to delete Subject'));
+    console.error('Unable to delete Role', err.responseText);
+    window.alert(client.translate('Unable to delete Role'));
     if (callback) {
       callback(err);
     }
@@ -150,7 +150,7 @@ function openDialog (role, client) {
 }
 
 function showRole (role, table, client) {
-  var editIcon = $('<img title="Edit this role" class="titletranslate" style="cursor:pointer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABEUlEQVQ4jZ3MMUsCYQDG8ee8IySQbNCLyyEKG/RLNAXicqvQcAeNLrcFLlE0+xHuNpt8wy04rrYm8Q4HQRE56BSC3lSqU1BwCoxM39dnffj9BWyxXvVeEzvtctBwHyRebNu2Nk2lzMlrgJB+qBEeTByiKYpihl+fIO8jTI9PDJEVF1+K2iw+M6PhDuyag4NkQi/c3FkCK5Z3ZbM76qLltpCbn+vXxq0FABsDy9hzPdBvqvtXvvXzrw1swmsDLPjfACteGeDBfwK8+FdgGwwAIgC0ncsjxGRSH/eiPBgAJADY2z8sJ4JBfNBsDqlADVYMANIzKalv/bHaefKsTH9iPFb8ISsGAJym0+Qinz3jQktbAHcxvx3559eSAAAAAElFTkSuQmCC">');
+  var editIcon = $('<img title="' + client.translate('Edit this role') + '" style="cursor:pointer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABEUlEQVQ4jZ3MMUsCYQDG8ee8IySQbNCLyyEKG/RLNAXicqvQcAeNLrcFLlE0+xHuNpt8wy04rrYm8Q4HQRE56BSC3lSqU1BwCoxM39dnffj9BWyxXvVeEzvtctBwHyRebNu2Nk2lzMlrgJB+qBEeTByiKYpihl+fIO8jTI9PDJEVF1+K2iw+M6PhDuyag4NkQi/c3FkCK5Z3ZbM76qLltpCbn+vXxq0FABsDy9hzPdBvqvtXvvXzrw1swmsDLPjfACteGeDBfwK8+FdgGwwAIgC0ncsjxGRSH/eiPBgAJADY2z8sJ4JBfNBsDqlADVYMANIzKalv/bHaefKsTH9iPFb8ISsGAJym0+Qinz3jQktbAHcxvx3559eSAAAAAElFTkSuQmCC">');
   editIcon.click(function clicked ( ) {
     openDialog(role, client);
   });

diff --git a/lib/admin_plugins/subjects.js b/lib/admin_plugins/subjects.js
@@ -149,11 +149,11 @@ function openDialog (subject, client) {
 }
 
 function showSubject (subject, table, client) {
-  var editIcon = $('<img title="Edit this subject" class="titletranslate" style="cursor:pointer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABEUlEQVQ4jZ3MMUsCYQDG8ee8IySQbNCLyyEKG/RLNAXicqvQcAeNLrcFLlE0+xHuNpt8wy04rrYm8Q4HQRE56BSC3lSqU1BwCoxM39dnffj9BWyxXvVeEzvtctBwHyRebNu2Nk2lzMlrgJB+qBEeTByiKYpihl+fIO8jTI9PDJEVF1+K2iw+M6PhDuyag4NkQi/c3FkCK5Z3ZbM76qLltpCbn+vXxq0FABsDy9hzPdBvqvtXvvXzrw1swmsDLPjfACteGeDBfwK8+FdgGwwAIgC0ncsjxGRSH/eiPBgAJADY2z8sJ4JBfNBsDqlADVYMANIzKalv/bHaefKsTH9iPFb8ISsGAJym0+Qinz3jQktbAHcxvx3559eSAAAAAElFTkSuQmCC">');
+  var editIcon = $('<img title="' + client.translate('Edit this subject') + '" style="cursor:pointer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABEUlEQVQ4jZ3MMUsCYQDG8ee8IySQbNCLyyEKG/RLNAXicqvQcAeNLrcFLlE0+xHuNpt8wy04rrYm8Q4HQRE56BSC3lSqU1BwCoxM39dnffj9BWyxXvVeEzvtctBwHyRebNu2Nk2lzMlrgJB+qBEeTByiKYpihl+fIO8jTI9PDJEVF1+K2iw+M6PhDuyag4NkQi/c3FkCK5Z3ZbM76qLltpCbn+vXxq0FABsDy9hzPdBvqvtXvvXzrw1swmsDLPjfACteGeDBfwK8+FdgGwwAIgC0ncsjxGRSH/eiPBgAJADY2z8sJ4JBfNBsDqlADVYMANIzKalv/bHaefKsTH9iPFb8ISsGAJym0+Qinz3jQktbAHcxvx3559eSAAAAAElFTkSuQmCC">');
   editIcon.click(function clicked ( ) {
     openDialog(subject, client);
   });
-  var deleteIcon = $('<img title="Delete this subject" class="titletranslate" style="cursor:pointer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACrElEQVQ4T42Ty2sTQRzHv5tmk2yyjRNtpfZhL8V6s2KoUNC2XqwgaCsVQcGiFqpHi0c9iRdR/ANE9KR40FIQX4cueKoPaKFoLdSYNtE0abKT1+5s9iW7aUMiHtzTzO7v85md+c6PA4DrHbsPCKIgOWO1pA7dT6YXnXH949SE/F63pqwZtRrO+SCKgjQ5NUV+azpmHj2krMwaJC4c8Erj+/eRyloMMwWFKgbn1nC3ervlK1evkXBLGBZT8SOewotnTylTNLdgeg/pDgZDC2cPHSR8bB22DVC9hFe0SG/H0xFXcHlykjRHRDBWgJcZSCY38Xx2lhqMnRYE34Px/sN9vlQWeoHBAx2yXsRruVAVuFsIBaSJ8+eJGPaBqQV4NROJjTzez89jLBoFn6FgybQL54wS3uTyVDFQ3cL2IYpBv3RhdJSIIQ80tQyv7gEqJvS8AmUlBs7UXPhtjtZgh3UFNYngk86NHCfNAg9dMwHVBPu+CpsVkTXKeJeVG+AGgTOZ3tt6MSKKjy+NjEBjFrR4ElZmA4pdxstMFsyyJu6tZZ7Ux9vwB6EAL50ZGiRECEPPUOixVTRxHlicgSVWxEdZpuZWfNuS2hk48NjwMIkIYZglBnV5Cbqtws/5IaAJmsfCglrEl2y2QeKmEBJ80tixKmxrFpSVr0gV0viQoxho2YUuPohmeFD22PiklLC4ma5JuBvdrfLJI0dJd0s7bM0ES8aR/BXDXGaTskqlL+D3Lwy0tZEePoAd4EA5YF4tYymdonfjmQh3s6dTPjU4SHYGwjAKecSXFyGlM1TdytntE56T+ts7SC/vhw3gm6njc2Kd3vm5Ub1IwQAvnYhGiZpYw1wiWYPrIw7wnBTt7CLOOwdmut14kQQvqt24tfK/utGR6LaF+iRqMf4N/O/8D28HiiCRYqzAAAAAAElFTkSuQmCC">');
+  var deleteIcon = $('<img title="' + client.translate('Delete this subject') + '" style="cursor:pointer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACrElEQVQ4T42Ty2sTQRzHv5tmk2yyjRNtpfZhL8V6s2KoUNC2XqwgaCsVQcGiFqpHi0c9iRdR/ANE9KR40FIQX4cueKoPaKFoLdSYNtE0abKT1+5s9iW7aUMiHtzTzO7v85md+c6PA4DrHbsPCKIgOWO1pA7dT6YXnXH949SE/F63pqwZtRrO+SCKgjQ5NUV+azpmHj2krMwaJC4c8Erj+/eRyloMMwWFKgbn1nC3ervlK1evkXBLGBZT8SOewotnTylTNLdgeg/pDgZDC2cPHSR8bB22DVC9hFe0SG/H0xFXcHlykjRHRDBWgJcZSCY38Xx2lhqMnRYE34Px/sN9vlQWeoHBAx2yXsRruVAVuFsIBaSJ8+eJGPaBqQV4NROJjTzez89jLBoFn6FgybQL54wS3uTyVDFQ3cL2IYpBv3RhdJSIIQ80tQyv7gEqJvS8AmUlBs7UXPhtjtZgh3UFNYngk86NHCfNAg9dMwHVBPu+CpsVkTXKeJeVG+AGgTOZ3tt6MSKKjy+NjEBjFrR4ElZmA4pdxstMFsyyJu6tZZ7Ux9vwB6EAL50ZGiRECEPPUOixVTRxHlicgSVWxEdZpuZWfNuS2hk48NjwMIkIYZglBnV5Cbqtws/5IaAJmsfCglrEl2y2QeKmEBJ80tixKmxrFpSVr0gV0viQoxho2YUuPohmeFD22PiklLC4ma5JuBvdrfLJI0dJd0s7bM0ES8aR/BXDXGaTskqlL+D3Lwy0tZEePoAd4EA5YF4tYymdonfjmQh3s6dTPjU4SHYGwjAKecSXFyGlM1TdytntE56T+ts7SC/vhw3gm6njc2Kd3vm5Ub1IwQAvnYhGiZpYw1wiWYPrIw7wnBTt7CLOOwdmut14kQQvqt24tfK/utGR6LaF+iRqMf4N/O/8D28HiiCRYqzAAAAAAElFTkSuQmCC">');
   deleteIcon.click(function clicked ( ) {
     var ok = window.confirm(client.translate('Are you sure you want to delete: ') + subject.name);
     if (ok) {

diff --git a/lib/bootevent.js b/lib/bootevent.js
@@ -4,9 +4,10 @@ var _ = require('lodash');
 
 var UPDATE_THROTTLE = 1000;
 
-function boot (env) {
+function boot (env, language) {
 
   function checkEnv (ctx, next) {
+    ctx.language = language;
     if (env.err) {
       ctx.bootErrors = ctx.bootErrors || [ ];
       ctx.bootErrors.push({'desc': 'ENV Error', err: env.err});
@@ -63,7 +64,10 @@ function boot (env) {
     ///////////////////////////////////////////////////
     // api and json object variables
     ///////////////////////////////////////////////////
-    ctx.plugins = require('./plugins')().registerServerDefaults().init(env.settings);
+    ctx.plugins = require('./plugins')({
+      settings: env.settings
+      , language: ctx.language
+    }).registerServerDefaults();
 
     ctx.pushover = require('./plugins/pushover')(env);
     ctx.maker = require('./plugins/maker')(env);

diff --git a/lib/client/browser-settings.js b/lib/client/browser-settings.js
@@ -203,10 +203,10 @@ function init (client, serverSettings, $) {
     showLocalstorageError();
   }
 
-  client.plugins.init(settings);
-
-  loadForm();
-  wireForm();
+  init.loadAndWireForm = function loadAndWireForm ( ) {
+    loadForm();
+    wireForm();
+  };
 
   return settings;
 }

diff --git a/lib/client/index.js b/lib/client/index.js
@@ -32,14 +32,8 @@ client.headers = function headers ( ) {
   }
 };
 
-client.init = function init(plugins, callback) {
-
-  client.plugins = plugins = client.plugins || plugins;
-  client.rawbg = plugins('rawbg');
-  client.delta = plugins('delta');
-  client.timeago = plugins('timeago');
-  client.direction = plugins('direction');
-  client.errorcodes = plugins('errorcodes');
+client.init = function init(callback) {
+
   client.browserUtils = require('./browser-utils')($);
 
   var token = client.browserUtils.queryParms().token;
@@ -126,7 +120,26 @@ client.load = function load(serverSettings, callback) {
     .attr('class', 'tooltip')
     .style('opacity', 0);
 
-  client.settings = require('./browser-settings')(client, serverSettings, $);
+  var browserSettings = require('./browser-settings');
+  client.settings = browserSettings(client, serverSettings, $);
+
+  language.set(client.settings.language).DOMtranslate($);
+  client.translate = language.translate;
+  client.language = language;
+
+  client.plugins = require('../plugins/')({
+    settings: client.settings
+    , language: language
+  }).registerClientDefaults();
+
+  //After plugins are initialized with browser settings;
+  browserSettings.loadAndWireForm();
+
+  client.rawbg = client.plugins('rawbg');
+  client.delta = client.plugins('delta');
+  client.timeago = client.plugins('timeago');
+  client.direction = client.plugins('direction');
+  client.errorcodes = client.plugins('errorcodes');
 
   client.ctx = {
     data: {}
@@ -137,12 +150,7 @@ client.load = function load(serverSettings, callback) {
   };
 
   client.utils = require('../utils')(client.ctx.settings);
-
   client.sbx = sandbox.clientInit(client.ctx, client.now);
-
-  language.set(client.settings.language).DOMtranslate($);
-  client.translate = language.translate;
-  client.language = language;
   client.renderer = require('./renderer')(client, d3, $);
 
   if (serverSettings && serverSettings.authorized) {
@@ -576,7 +584,7 @@ client.load = function load(serverSettings, callback) {
     silenceBtn.empty();
 
     _.each(client.settings.snoozeMinsForAlarmEvent(notify), function eachOption (mins) {
-      var snoozeOption = $('<li><a data-snooze-time="' + times.mins(mins).msecs + '">Silence for ' + mins + ' minutes</a></li>');
+      var snoozeOption = $('<li><a data-snooze-time="' + times.mins(mins).msecs + '">' + client.translate('Silence for %1 minutes', { params: [mins] }) + '</a></li>');
       snoozeOption.click(snoozeAlarm);
       silenceBtn.append(snoozeOption);
     });

diff --git a/lib/data/dataloader.js b/lib/data/dataloader.js
@@ -27,7 +27,7 @@ function init(env, ctx) {
       ddata.treatments = _.uniq(ddata.treatments, false, function (item) { return item._id.toString(); });
       //sort treatments so the last is the most recent
       ddata.treatments = _.sortBy(ddata.treatments, function (item) { return item.mills; });
-      fitTreatmentsToBGCurve(ddata, env.settings);
+      fitTreatmentsToBGCurve(ddata, env, ctx);
       if (err) {
         console.error(err);
       }

diff --git a/lib/data/treatmenttocurve.js b/lib/data/treatmenttocurve.js
@@ -1,9 +1,14 @@
 'use strict';
 
 var _ = require('lodash');
-var rawbg = require('../plugins/rawbg')();
 
-module.exports = function fitTreatmentsToBGCurve (ddata, settings) {
+module.exports = function fitTreatmentsToBGCurve (ddata, env, ctx) {
+
+  var settings = env.settings;
+  var rawbg = require('../plugins/rawbg')({
+    settings: settings
+    , language: ctx.language
+  });
 
   function updateTreatmentBG(treatment) {