#261 fixes

ZoneMinder · May 26, 2016 · bb4844e · bb4844e
1 parent cfa22e7
commit bb4844e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js
@@ -129,18 +129,18 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
             template: '<ion-radio-fix ng-repeat="item in allStateNames" ng-value="item" ng-model="myopt.selectedState"> {{item}} </ion-radio-fix>',
 
 
-            title: 'Select run state',
-            subTitle: 'current state:' + $scope.customState ? ("current state: " + $scope.customState) : "",
+            title: $translate.instant('kSelectRunState'),
+            subTitle: $translate.instant('kCurrentState') + $scope.customState ? ($translate.instant('kCurrentState')+": " + $scope.customState) : "",
             buttons: [
                 {
-                    text: 'Cancel',
+                    text: $translate.instant('kButtonCancel'),
                     onTap: function (e) {
                         return "CANCEL";
                     }
 
                 },
                 {
-                    text: 'OK',
+                    text:  $translate.instant('kButtonOk'),
                     onTap: function (e) {
                         return "OK";
 

diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json
@@ -38,6 +38,7 @@
    "kConfiguration"             : "Configuration",
    "kCredentialsBody"           : "Please provide your ZoneMinder credentials",
    "kCredentialsTitle"          : "Credentials Required",
+   "kCurrentState"              : "current state",
    "kCustomRange"               : "Custom Range",
    "kDay"                       : "Day",
    "kDelete"                    : "Delete",
@@ -215,6 +216,7 @@
    "kSec"                       : "sec",
    "kSelectFallback"            : "Select fallback",
    "kSelectLanguage"            : "Select Language",
+   "kSelectRunState"            : "Select run state",
    "kSendingPTZ"                : "Sending PTZ",
    "kSensitiveBody"             : "will modify the logs when creating the final output to remove sensitive data like urls and passwords. However it is eventually your responsibility to make sure there is no sensitive data in the logs. Please make sure you review and edit the logs before you send it out",
    "kSensitiveTitle"            : "Sensitive Information",