#261 more translations

Former-commit-id: 6f70c7f9c65866f0ae60c70d453d2936e92ab4db

5 files changed, 16 insertions, 8 deletions

diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 3f5c14d6..c202c20d 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -3,7 +3,7 @@
 /*This is for the loop closure I am using in line 143 */
 /* jslint browser: true*/
 /* global vis,cordova,StatusBar,angular,console,moment */
-angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', 'zmAutoLogin', '$ionicHistory', '$cordovaTouchID',  'EventServer', function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, zmAutoLogin, $ionicHistory, $cordovaTouchID,  EventServer) {
+angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', 'zmAutoLogin', '$ionicHistory', '$cordovaTouchID',  'EventServer', '$translate',function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, zmAutoLogin, $ionicHistory, $cordovaTouchID,  EventServer, $translate) {
 
 
     $scope.$on('$ionicView.enter',
@@ -137,7 +137,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
             zmAutoLogin.start();
             
             // PIN is fine, or not set so lets login
-            zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i>&nbsp;authenticating...</button>")
+            zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i>&nbsp;"+$translate.instant('kAuthenticating')+"...</button>")
                 .then(function (data) // success
                 {
                     ZMDataModel.zmDebug("PortalLogin: auth success");
diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js
index 25e88247..0e986662 100644
--- a/www/js/StateCtrl.js
+++ b/www/js/StateCtrl.js
@@ -10,12 +10,12 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
     //----------------------------------------------------------------------
     // Controller main
     //----------------------------------------------------------------------
-    $scope.zmRun = "loading...";
-    $scope.zmLoad = "loading...";
-    $scope.zmDisk = "loading...";
+    $scope.zmRun = "...";
+    $scope.zmLoad = "...";
+    $scope.zmDisk = "...";
     $scope.color = "";
     $scope.showDanger = false;
-    $scope.dangerText = ["Show ZoneMinder Controls", "Hide ZoneMinder Controls"];
+    $scope.dangerText = [$translate.instant('kStateShowControls'), $translate.instant('kStateHideControls')];
     $scope.dangerButtonColor = ["button-positive", "button-assertive"];
     $scope.customState = "";
     $scope.allStateNames = [];
diff --git a/www/js/app.js b/www/js/app.js
index f0f99be9..dadda298 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -736,7 +736,7 @@ angular.module('zmApp', [
 
     $rootScope.$on("auth-success", function () {
         var contentBannerInstance = $ionicContentBanner.show({
-            text: ['ZoneMinder authentication success'],
+            text: ['ZoneMinder' + $translate.instant('kAuthSuccess')],
             interval: 2000,
             type: 'info',
             transition: 'vertical'
@@ -1080,7 +1080,7 @@ angular.module('zmApp', [
             $rootScope.$apply(function () {
                 $rootScope.online = true;
                 ZMDataModel.zmLog("Your network is online, re-authenticating");
-                zmAutoLogin.doLogin("re-authenticating");
+                zmAutoLogin.doLogin($translate.instant('kReAuthenticating'));
 
             });
         }, false);
diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json
index 427ad915..290196f7 100644
--- a/www/lang/locale-en.json
+++ b/www/lang/locale-en.json
@@ -12,6 +12,7 @@
    "kApplyingChanges"           : "Applying changes. Please wait",
    "kArrangingImages"           : "arranging images",
    "kAt"                        : "at",
+   "kAuthSuccess"               : "authentication success",
    "kAuthenticating"            : "authenticating",
    "kAwake1"                    : "Keep display on",
    "kAwake2"                    : "(when viewing footage)",
@@ -190,6 +191,7 @@
    "kProfileChangeNotification" : "You have changed from {{oldName}} to {{newName}}. Please save this profile first",
    "kProtect"                   : "protect",
    "kPullToReload"              : "pull to reload data",
+   "kReAuthenticating"          : "re-authenticating",
    "kRecaptcha"                 : "Looks like you have enabled reCaptcha. It needs to be turned off for the app to work",
    "kReconfirmPin"              : "Reconfirm PIN",
    "kRecordingProgress"         : "recording in progress",
@@ -225,6 +227,8 @@
    "kSpeed"                     : "speed",
    "kStart"                     : "Start",
    "kStateAreYouSure"           : "Are you sure you want to ",
+   "kStateHideControls"         : "Hide ZoneMinder Controls",
+   "kStateShowControls"         : "Show ZoneMinder Controls",
    "kStatus"                    : "Status",
    "kStop"                      : "Stop",
    "kSuccess"                   : "Success",
diff --git a/www/lang/locale-it.json b/www/lang/locale-it.json
index cbc472a1..a52ffd44 100644
--- a/www/lang/locale-it.json
+++ b/www/lang/locale-it.json
@@ -12,6 +12,7 @@
    "kApplyingChanges"           : "APPLYING CHANGES. PLEASE WAIT",
    "kArrangingImages"           : "ARRANGING IMAGES",
    "kAt"                        : "AT",
+   "kAuthSuccess"               : "AUTHENTICATION SUCCESS",
    "kAuthenticating"            : "AUTHENTICATING",
    "kAwake1"                    : "KEEP DISPLAY ON",
    "kAwake2"                    : "(WHEN VIEWING FOOTAGE)",
@@ -190,6 +191,7 @@
    "kProfileChangeNotification" : "YOU HAVE CHANGED FROM {{OLDNAME}} TO {{NEWNAME}}. PLEASE SAVE THIS PROFILE FIRST",
    "kProtect"                   : "PROTECT",
    "kPullToReload"              : "PULL TO RELOAD DATA",
+   "kReAuthenticating"          : "RE-AUTHENTICATING",
    "kRecaptcha"                 : "LOOKS LIKE YOU HAVE ENABLED RECAPTCHA. IT NEEDS TO BE TURNED OFF FOR THE APP TO WORK",
    "kReconfirmPin"              : "RECONFIRM PIN",
    "kRecordingProgress"         : "RECORDING IN PROGRESS",
@@ -225,6 +227,8 @@
    "kSpeed"                     : "SPEED",
    "kStart"                     : "START",
    "kStateAreYouSure"           : "ARE YOU SURE YOU WANT TO ",
+   "kStateHideControls"         : "HIDE ZONEMINDER CONTROLS",
+   "kStateShowControls"         : "SHOW ZONEMINDER CONTROLS",
    "kStatus"                    : "STATUS",
    "kStop"                      : "STOP",
    "kSuccess"                   : "SUCCESS",