diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-05-26 09:10:55 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-05-26 09:10:55 -0400 |
| commit | 0190dfda57c5509b791fbfe6a2b5dbcce7d8589e (patch) | |
| tree | 250ffae59b47fe31f6d1e915ecbbc0c686c61fda | |
| parent | ff9636addd3997925398e8d8d159131eb38bdd04 (diff) | |
#261 updates
Former-commit-id: c26c07c38ba6c17dc98b6544ba8351d91956e7c1
| -rw-r--r-- | www/js/StateCtrl.js | 16 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 3 | ||||
| -rw-r--r-- | www/lang/locale-it.json | 3 |
3 files changed, 14 insertions, 8 deletions
diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js index 0e986662..ac8040c8 100644 --- a/www/js/StateCtrl.js +++ b/www/js/StateCtrl.js @@ -200,15 +200,15 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup' ZMDataModel.zmDebug("Run results: " + JSON.stringify(success)); switch (success.data.result) { case 1: - $scope.zmRun = 'running'; + $scope.zmRun = $translate.instant('kZMRunning'); $scope.color = 'color:green;'; break; case 0: - $scope.zmRun = 'stopped'; + $scope.zmRun = $translate.instant('kZMStopped'); $scope.color = 'color:red;'; break; default: - $scope.zmRun = 'undetermined'; + $scope.zmRun = $translate.instant('kZMUndetermined'); $scope.color = 'color:orange;'; break; @@ -221,7 +221,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup' //console.log("ERROR in getRun: " + JSON.stringify(error)); ZMDataModel.zmLog("Error getting RunStatus " + JSON.stringify(error), "error"); $scope.color = 'color:red;'; - $scope.zmRun = 'undetermined'; + $scope.zmRun = $translate.instant('kZMUndetermined'); } ); @@ -264,7 +264,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup' ZMDataModel.zmDebug("inside performZMoperation with " + str); - $scope.zmRun = "please wait..."; + $scope.zmRun = "..."; $scope.color = 'color:orange;'; $scope.customState = ""; ZMDataModel.zmDebug("StateCtrl/controlZM: POST Control command is " + apiExec + str + ".json"); @@ -276,11 +276,11 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup' inProgress = 0; switch (str) { case "stop": - $scope.zmRun = 'stopped'; + $scope.zmRun = $translate.instant('kZMStopped'); $scope.color = 'color:red;'; break; default: - $scope.zmRun = 'running'; + $scope.zmRun = $translate.instant('kZMRunning'); $scope.color = 'color:green;'; getCurrentState(); break; @@ -294,7 +294,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup' //console.log("ERROR in Change State:" + JSON.stringify(error)); ZMDataModel.zmDebug("StateCtrl/controlZM: returned error"); ZMDataModel.zmLog("Error in change run state:" + JSON.stringify(error), "error"); - $scope.zmRun = 'undetermined'; + $scope.zmRun = $translate.instant('kZMUndetermined'); $scope.color = 'color:orange;'; inProgress = 0; diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 9ac41b13..4b3463b9 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -284,6 +284,9 @@ "kWizZMAuth" : "I use ZM authentication", "kWizard" : "Wizard", "kWorkingOnGraph" : "working on graph data", + "kZMRunning" : "running", "kZMSettingsFor" : "ZoneMinder settings for", + "kZMStopped" : "stopped", + "kZMUndetermined" : "undetermined", "kZMUpgradeNeeded" : "ZoneMinder upgrade needed" }
\ No newline at end of file diff --git a/www/lang/locale-it.json b/www/lang/locale-it.json index 3a3c305d..59c89203 100644 --- a/www/lang/locale-it.json +++ b/www/lang/locale-it.json @@ -284,6 +284,9 @@ "kWizZMAuth" : "I USE ZM AUTHENTICATION", "kWizard" : "WIZARD", "kWorkingOnGraph" : "WORKING ON GRAPH DATA", + "kZMRunning" : "RUNNING", "kZMSettingsFor" : "ZONEMINDER SETTINGS FOR", + "kZMStopped" : "STOPPED", + "kZMUndetermined" : "UNDETERMINED", "kZMUpgradeNeeded" : "ZONEMINDER UPGRADE NEEDED" } |