Merge remote-tracking branch 'refs/remotes/pliablepixels/master'

2 files changed, 11 insertions, 2 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 382f1f36..7c46c1d0 100644..100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -46,6 +46,10 @@ angular.module('zmApp.controllers')
                 value: 'it'
             },
             {
+                text: 'Nederlands',
+                value: 'nl'
+            },
+            {
                 text: 'Polski',
                 value: 'pl'
             },
@@ -144,7 +148,7 @@ angular.module('zmApp.controllers')
             'fastLogin': true,
             'followTimeLine': false,
             'timelineScale': -1,
-            'hideArchived': false,
+            'hideArchived': false
 
         };
 
@@ -958,6 +962,8 @@ angular.module('zmApp.controllers')
 
                                 }
 
+
+
                                 if (typeof loginData.monSingleImageQuality == 'undefined')
                                 {
 
diff --git a/www/js/app.js b/www/js/app.js
index 4827af11..f7bc5e69 100644..100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -102,6 +102,8 @@ angular.module('zmApp', [
 
 })
 
+
+// for events view
 .filter ('eventListFilter', function(NVRDataModel)
 {
     return function (input) {
@@ -1986,7 +1988,7 @@ angular.module('zmApp', [
 
     //$translateProvider.useLocalStorage();
 
-    $translateProvider.registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ru', 'ja', 'ko', 'pl', 'zh', 'zh_CN', 'zh_TW', 'pt', 'ar', 'hi'],
+    $translateProvider.registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ru', 'ja', 'ko', 'nl', 'pl', 'zh', 'zh_CN', 'zh_TW', 'pt', 'ar', 'hi'],
     {
         'en_*': 'en',
         'de_*': 'de',
@@ -1996,6 +1998,7 @@ angular.module('zmApp', [
         'ru_*': 'ru',
         'ja_*': 'ja',
         'ko_*': 'ko',
+        'nl_*': 'nl',
         'pt_*': 'pt',
         'pl_*': 'pl',
         'ar_*': 'ar',