diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-05-26 08:18:44 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-05-26 08:18:44 -0400 |
| commit | 7b41ef75fb30b222808892831e461ecbb9835201 (patch) | |
| tree | 69c93bf68ca648a0c507860c52487381e37ffbdf /www/js | |
| parent | 59bfe98d911728cfefd2321bf4ac86d62f4c64f8 (diff) | |
#261 more translations
Former-commit-id: 6f70c7f9c65866f0ae60c70d453d2936e92ab4db
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 4 | ||||
| -rw-r--r-- | www/js/StateCtrl.js | 8 | ||||
| -rw-r--r-- | www/js/app.js | 4 |
3 files changed, 8 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> 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> "+$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); |