#325 - imported initial arabic lang file, manually merged other changes

Former-commit-id: 40efb97aadd7b1399f12c40d5a40b7b856548c52

4 files changed, 17 insertions, 18 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 9447020a..be6aa43b 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -41,13 +41,13 @@ angular.module('zmApp.controllers')
                 value: 'pt'
             },
             {
-                text: 'Arabic',
+                text: 'العربية',
                 value: 'ar'
             },
-            {
+           /* {
                 text: 'Hindi',
                 value: 'hi'
-            }
+            }*/
         ];
 
         var serverGroupList = {};
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 3c720991..db978454 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -252,7 +252,7 @@ angular.module('zmApp.controllers')
         if ($rootScope.fromString)
             nolangFrom = moment($rootScope.fromString).locale('en').format("YYYY-MM-DD HH:mm:ss");
         if ($rootScope.toString)
-        nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss");
+            nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss");
         NVRDataModel.getEventsPages($scope.id, nolangFrom, nolangTo)
             .then(function (data) {
                 eventsPage = data.pageCount;
@@ -267,8 +267,8 @@ angular.module('zmApp.controllers')
                 if ($rootScope.fromString)
                     nolangFrom = moment($rootScope.fromString).locale('en').format("YYYY-MM-DD HH:mm:ss");
                 if ($rootScope.toString)
-                nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss");
-                
+                    nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss");
+
                 NVRDataModel.getEvents($scope.id, eventsPage, "", nolangFrom, nolangTo)
                     .then(function (data) {
 
@@ -1621,7 +1621,7 @@ angular.module('zmApp.controllers')
             nolangFrom = moment($rootScope.fromString).locale('en').format("YYYY-MM-DD HH:mm:ss");
         if ($rootScope.toString)
             nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss");
-        
+
         NVRDataModel.getEvents($scope.id, eventsPage, loadingStr, nolangFrom, nolangTo)
             .then(function (data) {
                     var loginData = NVRDataModel.getLogin();
@@ -1646,7 +1646,7 @@ angular.module('zmApp.controllers')
                             }
                         }
 
-                        
+
                         myevents[i].Event.humanizeTime = humanizeTime(myevents[i].Event.StartTime);
                         myevents[i].Event.MonitorName = NVRDataModel.getMonitorName(myevents[i].Event.MonitorId);
                         // now construct base path
@@ -1699,14 +1699,13 @@ angular.module('zmApp.controllers')
     //--------------------------------------
     // formats events dates in a nice way
     //---------------------------------------
-    
-   
-    function humanizeTime(str)
-    {
+
+
+    function humanizeTime(str) {
         return moment(str).fromNow();
-        
+
     }
-    
+
     $scope.prettifyDate = function (str) {
         return moment(str).format('MMM Do');
     };
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 7bc7433c..ce745716 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -114,9 +114,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         NVRDataModel.debug("Got network change:" + data);
         var ds;
         if (data == 'lowbw') {
-            ds = "low bandwidth mode";
+            ds = $translate.instant('kLowBWDisplay');
         } else {
-            ds = "high bandwidth mode";
+            ds = $translate.instant('kHighBWDisplay');
         }
         NVRDataModel.displayBanner('net', [ds]);
 
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index bff471d3..db4391d1 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -36,9 +36,9 @@ angular.module('zmApp.controllers')
         NVRDataModel.debug("Got network change:" + data);
         var ds;
         if (data == 'lowbw') {
-            ds = "low bandwidth mode";
+            ds = $translate.instant('kLowBWDisplay');
         } else {
-            ds = "high bandwidth mode";
+            ds = $translate.instant('kHighBWDisplay');
         }
         NVRDataModel.displayBanner('net', [ds]);
         var ld = NVRDataModel.getLogin();