From 75a26e142644f1a353f7ec8216e16802da8e9421 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Thu, 26 May 2016 09:19:56 -0400
Subject: #261 fixes

Former-commit-id: b7e474449c605c8ae59d45f2e1dd8187f6ae2e32
---
 www/js/StateCtrl.js     | 8 ++++----
 www/lang/locale-en.json | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'www')

diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js
index ac8040c8..8f3d6032 100644
--- 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
index 4b3463b9..d6fef580 100644
--- 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",
-- 
cgit v1.2.3