#325 - force english for paths

Former-commit-id: b73fba3555d38c0215b2bcf97348debcbea0113b

10 files changed, 80 insertions, 82 deletions

diff --git a/config.xml b/config.xml
index 348a4601..275cdb81 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.20" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.21" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
diff --git a/plugins/fetch.json b/plugins/fetch.json
index d5cb12fb..cc57eaac 100644
--- a/plugins/fetch.json
+++ b/plugins/fetch.json
@@ -99,14 +99,6 @@
         "is_top_level": true,
         "variables": {}
     },
-    "cordova-plugin-statusbar": {
-        "source": {
-            "type": "registry",
-            "id": "cordova-plugin-statusbar"
-        },
-        "is_top_level": true,
-        "variables": {}
-    },
     "com.telerik.plugins.nativepagetransitions": {
         "source": {
             "type": "git",
@@ -186,27 +178,35 @@
         "is_top_level": true,
         "variables": {}
     },
-    "cordova-plugin-certificates": {
+    "cordova-plugin-android-permissions": {
         "source": {
-            "type": "git",
-            "url": "https://github.com/hypery2k/cordova-certificate-plugin",
-            "subdir": "."
+            "type": "registry",
+            "id": "cordova-plugin-android-permissions"
         },
         "is_top_level": true,
         "variables": {}
     },
-    "cordova-plugin-android-permissions": {
+    "cordova-plugin-network-information": {
         "source": {
             "type": "registry",
-            "id": "cordova-plugin-android-permissions"
+            "id": "cordova-plugin-network-information"
         },
         "is_top_level": true,
         "variables": {}
     },
-    "cordova-plugin-network-information": {
+    "cordova-plugin-certificates": {
+        "source": {
+            "type": "git",
+            "url": "https://github.com/hypery2k/cordova-certificate-plugin",
+            "subdir": "."
+        },
+        "is_top_level": true,
+        "variables": {}
+    },
+    "cordova-plugin-statusbar": {
         "source": {
             "type": "registry",
-            "id": "cordova-plugin-network-information"
+            "id": "cordova-plugin-statusbar"
         },
         "is_top_level": true,
         "variables": {}
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 435b9bf9..83982c1c 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -39,6 +39,10 @@ angular.module('zmApp.controllers')
             {
                 text: 'Portugese',
                 value: 'pt'
+            },
+            {
+                text: 'Hindi',
+                value: 'hi'
             }
         ];
 
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index d7ebdfa9..b802ff0e 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -1372,12 +1372,12 @@ angular.module('zmApp.controllers')
         var relativePath = "";
         var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
-        var yy = moment(str).format('YY');
-        var mm = moment(str).format('MM');
-        var dd = moment(str).format('DD');
-        var hh = moment(str).format('HH');
-        var min = moment(str).format('mm');
-        var sec = moment(str).format('ss');
+        var yy = moment(str).locale('en').format('YY');
+        var mm = moment(str).locale('en').format('MM');
+        var dd = moment(str).locale('en').format('DD');
+        var hh = moment(str).locale('en').format('HH');
+        var min = moment(str).locale('en').format('mm');
+        var sec = moment(str).locale('en').format('ss');
         relativePath = event.Event.MonitorId + "/" +
             yy + "/" +
             mm + "/" +
@@ -1397,12 +1397,12 @@ angular.module('zmApp.controllers')
         var basePath = "";
         var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
-        var yy = moment(str).format('YY');
-        var mm = moment(str).format('MM');
-        var dd = moment(str).format('DD');
-        var hh = moment(str).format('HH');
-        var min = moment(str).format('mm');
-        var sec = moment(str).format('ss');
+        var yy = moment(str).locale('en').format('YY');
+        var mm = moment(str).locale('en').format('MM');
+        var dd = moment(str).locale('en').format('DD');
+        var hh = moment(str).locale('en').format('HH');
+        var min = moment(str).locale('en').format('mm');
+        var sec = moment(str).locale('en').format('ss');
 
         basePath = event.Event.baseURL + "/events/" +
             event.Event.MonitorId + "/" +
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 1731af45..373d415b 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1268,12 +1268,12 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         var relativePath = "";
         var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
-        var yy = moment(str).format('YY');
-        var mm = moment(str).format('MM');
-        var dd = moment(str).format('DD');
-        var hh = moment(str).format('HH');
-        var min = moment(str).format('mm');
-        var sec = moment(str).format('ss');
+        var yy = moment(str).locale('en').format('YY');
+        var mm = moment(str).locale('en').format('MM');
+        var dd = moment(str).locale('en').format('DD');
+        var hh = moment(str).locale('en').format('HH');
+        var min = moment(str).locale('en').format('mm');
+        var sec = moment(str).locale('en').format('ss');
         relativePath = event.Event.MonitorId + "/" +
             yy + "/" +
             mm + "/" +
@@ -1293,12 +1293,12 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         var basePath = "";
         var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
-        var yy = moment(str).format('YY');
-        var mm = moment(str).format('MM');
-        var dd = moment(str).format('DD');
-        var hh = moment(str).format('HH');
-        var min = moment(str).format('mm');
-        var sec = moment(str).format('ss');
+        var yy = moment(str).locale('en').format('YY');
+        var mm = moment(str).locale('en').format('MM');
+        var dd = moment(str).locale('en').format('DD');
+        var hh = moment(str).locale('en').format('HH');
+        var min = moment(str).locale('en').format('mm');
+        var sec = moment(str).locale('en').format('ss');
 
         basePath = loginData.url + "/events/" +
             event.Event.MonitorId + "/" +
diff --git a/www/js/EventsModalGraphCtrl.js b/www/js/EventsModalGraphCtrl.js
index fb349df0..0874e4f7 100644
--- a/www/js/EventsModalGraphCtrl.js
+++ b/www/js/EventsModalGraphCtrl.js
@@ -334,12 +334,12 @@ angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope'
         var relativePath = "";
         var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
-        var yy = moment(str).format('YY');
-        var mm = moment(str).format('MM');
-        var dd = moment(str).format('DD');
-        var hh = moment(str).format('HH');
-        var min = moment(str).format('mm');
-        var sec = moment(str).format('ss');
+        var yy = moment(str).locale('en').format('YY');
+        var mm = moment(str).locale('en').format('MM');
+        var dd = moment(str).locale('en').format('DD');
+        var hh = moment(str).locale('en').format('HH');
+        var min = moment(str).locale('en').format('mm');
+        var sec = moment(str).locale('en').format('ss');
         relativePath = event.Event.MonitorId + "/" +
             yy + "/" +
             mm + "/" +
@@ -359,12 +359,12 @@ angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope'
         var basePath = "";
         var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
-        var yy = moment(str).format('YY');
-        var mm = moment(str).format('MM');
-        var dd = moment(str).format('DD');
-        var hh = moment(str).format('HH');
-        var min = moment(str).format('mm');
-        var sec = moment(str).format('ss');
+        var yy = moment(str).locale('en').format('YY');
+        var mm = moment(str).locale('en').format('MM');
+        var dd = moment(str).locale('en').format('DD');
+        var hh = moment(str).locale('en').format('HH');
+        var min = moment(str).locale('en').format('mm');
+        var sec = moment(str).locale('en').format('ss');
 
         basePath = loginData.url + "/events/" +
             event.Event.MonitorId + "/" +
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 87542f0b..1859e866 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -4,7 +4,8 @@
 /* global cordova,StatusBar,angular,console,ionic,Packery, Draggabilly, imagesLoaded, ConnectSDK */
 
 
-angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '$rootScope', 'NVRDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', 'imageLoadingDataShare', '$window', '$localstorage', '$translate', function ($scope, $rootScope, NVRDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm, $ionicPopover, $controller, imageLoadingDataShare, $window, $localstorage, $translate) {
+angular.module('zmApp.controllers')
+    .controller('zmApp.MontageCtrl', ['$scope', '$rootScope', 'NVRDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', 'imageLoadingDataShare', '$window', '$localstorage', '$translate', function ($scope, $rootScope, NVRDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm, $ionicPopover, $controller, imageLoadingDataShare, $window, $localstorage, $translate) {
 
     //---------------------------------------------------------------------
     // Controller main
@@ -40,9 +41,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
             ds = "high bandwidth mode";
         }
         NVRDataModel.displayBanner('net', [ds]);
-
         var ld = NVRDataModel.getLogin();
-        
         refreshSec = (NVRDataModel.getBandwidth()=='lowbw') ? ld.refreshSecLowBW : ld.refreshSec;
         $interval.cancel(intervalHandleMontage);
         intervalHandleMontage = $interval(function () {
diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js
index 87f26126..10aa2ce3 100644
--- a/www/js/TimelineModalCtrl.js
+++ b/www/js/TimelineModalCtrl.js
@@ -398,12 +398,12 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
         var relativePath = "";
         var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
-        var yy = moment(str).format('YY');
-        var mm = moment(str).format('MM');
-        var dd = moment(str).format('DD');
-        var hh = moment(str).format('HH');
-        var min = moment(str).format('mm');
-        var sec = moment(str).format('ss');
+        var yy = moment(str).locale('en').format('YY');
+        var mm = moment(str).locale('en').format('MM');
+        var dd = moment(str).locale('en').format('DD');
+        var hh = moment(str).locale('en').format('HH');
+        var min = moment(str).locale('en').format('mm');
+        var sec = moment(str).locale('en').format('ss');
         relativePath = event.Event.MonitorId + "/" +
             yy + "/" +
             mm + "/" +
@@ -423,12 +423,12 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
         var basePath = "";
         var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
-        var yy = moment(str).format('YY');
-        var mm = moment(str).format('MM');
-        var dd = moment(str).format('DD');
-        var hh = moment(str).format('HH');
-        var min = moment(str).format('mm');
-        var sec = moment(str).format('ss');
+        var yy = moment(str).locale('en').format('YY');
+        var mm = moment(str).locale('en').format('MM');
+        var dd = moment(str).locale('en').format('DD');
+        var hh = moment(str).locale('en').format('HH');
+        var min = moment(str).locale('en').format('mm');
+        var sec = moment(str).locale('en').format('ss');
 
         basePath = loginData.url + "/events/" +
             event.Event.MonitorId + "/" +
diff --git a/www/js/app.js b/www/js/app.js
index 551273b1..93269a32 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -2,6 +2,12 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console,alert,PushNotification, moment ,ionic, URI,Packery, ConnectSDK, CryptoJS, ContactFindOptions, localforage,$, Connection*/
 
+// For desktop versions, this is replaced
+// with actual app version from config.xml by the 
+// ./make_desktop.sh script
+
+// For mobile versions, I use cordova app version plugin
+// to get it at run time
 
 var appVersion = "0.0.0";
 
@@ -116,18 +122,6 @@ angular.module('zmApp', [
 
 })
 
-// https://forum.ionicframework.com/t/ng-src-not-updated-in-video-tag/7540/6
-.directive('dynamicUrl', function () {
-    return {
-        restrict: 'A',
-        link: function postLink(scope, element, attr) {
-            element.attr('src', attr.dynamicUrlSrc);
-        }
-    };
-})
-
-
-
 
 // credit https://gist.github.com/Zren/beaafd64f395e23f4604
 
@@ -1507,7 +1501,7 @@ angular.module('zmApp', [
     //$translateProvider.useLocalStorage();
 
 
-    $translateProvider.registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ja', 'ko', 'zh', 'zh_CN', 'zh_TW', 'pt'], {
+    $translateProvider.registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ja', 'ko', 'zh', 'zh_CN', 'zh_TW', 'pt', 'hi'], {
         'en_*': 'en',
         'de_*': 'de',
         'es_*': 'es',
@@ -1516,6 +1510,7 @@ angular.module('zmApp', [
         'ja_*': 'ja',
         'ko_*': 'ko',
         'pt_*': 'pt',
+        'hi_*': 'hi',
         '*': 'en' // must be last
     });
 
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 355ff4f2..2f8bc08d 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -120,7 +120,7 @@
 
 
 
-   <div class="events-range-modal-text">{{mName}}&nbsp;<i class="ion-arrow-right-b"></i>&nbsp;{{humanizeTime}} ({{'kEvent' | translate}}:{{d_eventId}}) </div>
+   <div class="events-range-modal-text">{{mName}}&nbsp;<i class="ion-arrow-right-b"></i>&nbsp;{{humanizeTime}} ({{d_eventId}}) </div>
 
    <div id="flyoutmenu" style="position:absolute;bottom:100px;left:10px">
         <ul>