diff options
| -rw-r--r-- | www/js/TimelineModalCtrl.js | 14 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 4 | ||||
| -rw-r--r-- | www/lang/locale-it.json | 4 | ||||
| -rw-r--r-- | www/templates/eventserversettings.html | 4 |
4 files changed, 17 insertions, 9 deletions
diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js index 623deef3..35d93ea9 100644 --- a/www/js/TimelineModalCtrl.js +++ b/www/js/TimelineModalCtrl.js @@ -6,7 +6,7 @@ -angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '$rootScope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', function ($scope, $rootScope, zm, ZMDataModel, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup) { +angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '$rootScope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', '$translate', function ($scope, $rootScope, zm, ZMDataModel, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup, $translate) { @@ -80,10 +80,10 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' $scope.switchType = function() { - if ($scope.graphType == "all") + if ($scope.graphType == $translate.instant('kGraphAll')) { current_data = onlyalarm_data; - $scope.graphType = "alarmed"; + $scope.graphType = $translate.instant('kGraphAlarmed'); ZMDataModel.zmDebug ("Alarm array has " + onlyalarm_data.labels.length+ " frames"); btype='bar'; //console.log (JSON.stringify(onlyalarm_data)); @@ -93,7 +93,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' { current_data = data; // tcGraph.data = - $scope.graphType = "all"; + $scope.graphType = $translate.instant('kGraphAll'); btype='line'; } @@ -175,7 +175,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' ZMDataModel.zmLog("Image padding digits reported as " + eventImageDigits); }); - $scope.eventdetails = "loading..."; + $scope.eventdetails = $translate.instant('kLoading')+"..."; processEvent(); //$scope.eventdetails = JSON.stringify($scope.event); }); @@ -200,7 +200,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' }, function (error) { - $scope.errorDetails = "there was an error rendering the graph. Please see logs"; + $scope.errorDetails = $translate.instant('kGraphError'); ZMDataModel.zmLog ("Error in timeline frames " + JSON.stringify(error)); }); } @@ -371,7 +371,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' cv = document.getElementById("tcchart"); ctx = cv.getContext("2d"); - if (ZMDataModel.getLogin().timelineModalGraphType == 'all') + if (ZMDataModel.getLogin().timelineModalGraphType == $translate.instant('kGraphAll')) { btype = 'line'; current_data = data; diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 290196f7..9ac41b13 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -99,6 +99,9 @@ "kFrom" : "From", "kFromDate" : "From Date", "kFromTime" : "From Time", + "kGraphAlarmed" : "alarmed", + "kGraphAll" : "all", + "kGraphError" : "there was an error rendering the graph. Please see logs", "kH264VideoSupport" : "H264 Video support", "kHideMonsWithoutEvents" : "Hide monitors without events", "kId" : "Id", @@ -250,6 +253,7 @@ "kTrying" : "trying", "kType" : "type", "kUnknown" : "(unknown)", + "kUseEventServer" : "Use event server", "kUseSSL" : "Use SSL", "kUseVideoControls" : "Please use video player controls for H264 events. ZoneMinder doesn't yet support zms controls", "kUseZmAuth" : "use ZM authentication", diff --git a/www/lang/locale-it.json b/www/lang/locale-it.json index a52ffd44..3a3c305d 100644 --- a/www/lang/locale-it.json +++ b/www/lang/locale-it.json @@ -99,6 +99,9 @@ "kFrom" : "FROM", "kFromDate" : "FROM DATE", "kFromTime" : "FROM TIME", + "kGraphAlarmed" : "ALARMED", + "kGraphAll" : "ALL", + "kGraphError" : "THERE WAS AN ERROR RENDERING THE GRAPH. PLEASE SEE LOGS", "kH264VideoSupport" : "H264 VIDEO SUPPORT", "kHideMonsWithoutEvents" : "HIDE MONITORS WITHOUT EVENTS", "kId" : "ID", @@ -250,6 +253,7 @@ "kTrying" : "TRYING", "kType" : "TYPE", "kUnknown" : "(UNKNOWN)", + "kUseEventServer" : "USE EVENT SERVER", "kUseSSL" : "USE SSL", "kUseVideoControls" : "PLEASE USE VIDEO PLAYER CONTROLS FOR H264 EVENTS. ZONEMINDER DOESN'T YET SUPPORT ZMS CONTROLS", "kUseZmAuth" : "USE ZM AUTHENTICATION", diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html index 58c4777c..3ea25eb4 100644 --- a/www/templates/eventserversettings.html +++ b/www/templates/eventserversettings.html @@ -7,7 +7,7 @@ <ion-nav-buttons side="right"> - <button class="button button-clear" ng-click="saveItems()">Save</button> + <button class="button button-clear" ng-click="saveItems()">{{'kSave'|translate}}</button> </ion-nav-buttons> <ion-content padding="true"> @@ -15,7 +15,7 @@ <div class="list list-inset"> {{'kEventServerConfig1' | translate }} </div> - <ion-checkbox ng-model="loginData.isUseEventServer" ng-checked="{{loginData.isUseEventServer}}">use event server</ion-checkbox> + <ion-checkbox ng-model="loginData.isUseEventServer" ng-checked="{{loginData.isUseEventServer}}">{{'kUseEventServer' | translate}}</ion-checkbox> <ion-item ng-href="" ng-click="selectScreen()"> |