added translations for buttons #410

12 files changed, 70 insertions, 22 deletions

diff --git a/www/css/style.css b/www/css/style.css
index 6fcc78f4..18a34314 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -1076,8 +1076,11 @@ videogular div.event-time {
 
 /* make sure this is after last-child */
 
+
+
+
 #flyoutmenu li:only-child {
-    /*background: rgba(192, 57, 43, 0.7);*/
+    
     background: rgba(108, 122, 137, 0.7);
     -webkit-border-radius: 5px 5px 5px 5px;
 }
diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js
index d0b36299..970c690d 100644
--- a/www/js/DevOptionsCtrl.js
+++ b/www/js/DevOptionsCtrl.js
@@ -123,7 +123,9 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
         $rootScope.zmPopup = SecuredPopups.show('alert',
         {
             title: $translate.instant('kSettingsSaved'),
-            template: "{{'kExploreEnjoy' | translate }} {{$root.appName}}"
+            template: "{{'kExploreEnjoy' | translate }} {{$root.appName}}",
+            okText: $translate.instant('kButtonOk'),
+            cancelText: $translate.instant('kButtonCancel'),
         }).then(function(res)
         {
             $ionicSideMenuDelegate.toggleLeft();
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 3ff6c1ce..32f8b119 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -306,7 +306,9 @@ angular.module('zmApp.controllers')
             $ionicPopup.alert(
             {
                 title: pTitle,
-                template: "{{'kCheckCredentials' | translate }}"
+                template: "{{'kCheckCredentials' | translate }}",
+                okText: $translate.instant('kButtonOk'),
+                cancelText: $translate.instant('kButtonCancel'),
             });
             $ionicHistory.nextViewOptions(
             {
@@ -762,7 +764,9 @@ angular.module('zmApp.controllers')
         $ionicPopup.alert(
         {
             title: $translate.instant('kNote'),
-            template: "{{'kVideoMp4Warning' | translate }}"
+            template: "{{'kVideoMp4Warning' | translate }}",
+            okText: $translate.instant('kButtonOk'),
+            cancelText: $translate.instant('kButtonCancel'),
         });
     };
 
@@ -1183,7 +1187,9 @@ angular.module('zmApp.controllers')
             $ionicPopup.confirm(
             {
                 title: $translate.instant('kNote'),
-                template: "{{'kGifWarning' | translate }}"
+                template: "{{'kGifWarning' | translate }}",
+                okText: $translate.instant('kButtonOk'),
+                cancelText: $translate.instant('kButtonCancel'),
             }).then(function(res)
             {
                 if (res)
@@ -1603,7 +1609,9 @@ angular.module('zmApp.controllers')
         $rootScope.zmPopup = $ionicPopup.confirm(
         {
             title: $translate.instant('kFilterSettings'),
-            template: $translate.instant('kFilterEventsBetween1') + ':<br/> <b>' + myFrom + "</b> " + $translate.instant('kTo') + " <b>" + toString + '</b><br/>' + $translate.instant('kFilterEventsBetween2')
+            template: $translate.instant('kFilterEventsBetween1') + ':<br/> <b>' + myFrom + "</b> " + $translate.instant('kTo') + " <b>" + toString + '</b><br/>' + $translate.instant('kFilterEventsBetween2'),
+            okText: $translate.instant('kButtonOk'),
+            cancelText: $translate.instant('kButtonCancel'),
         });
         $rootScope.zmPopup.then(function(res)
         {
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 81cf702a..c1633d1f 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -220,7 +220,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         $rootScope.zmPopup = SecuredPopups.show('alert',
         {
             title: $translate.instant('kError'),
-            template: $rootScope.platformOS == 'desktop' ? $translate.instant('kVideoError') : $translate.instant('kVideoErrorMobile')
+            template: $rootScope.platformOS == 'desktop' ? $translate.instant('kVideoError') : $translate.instant('kVideoErrorMobile'),
+            okText: $translate.instant('kButtonOk'),
+            cancelText: $translate.instant('kButtonCancel'),
         });
 
     };
diff --git a/www/js/EventServer.js b/www/js/EventServer.js
index 464c5180..b0d0c83f 100644
--- a/www/js/EventServer.js
+++ b/www/js/EventServer.js
@@ -167,7 +167,9 @@ angular.module('zmApp.controllers')
                         {
                             title: $translate.instant('kEventServerVersionTitle'),
                             template: $translate.instant('kEventServerVersionBody1') + " " + str.version + ". " + $translate.instant('kEventServerVersionBody2') +
-                                zm.minEventServerVersion
+                                zm.minEventServerVersion,
+                                okText: $translate.instant('kButtonOk'),
+                                cancelText: $translate.instant('kButtonCancel'),
                         });
                     }
 
diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js
index d2a9451d..ed35f6a9 100644
--- a/www/js/LogCtrl.js
+++ b/www/js/LogCtrl.js
@@ -37,6 +37,8 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
         {
             title: $translate.instant('kPleaseConfirm'),
             template: $translate.instant('kDeleteLogsConfirm'),
+            okText: $translate.instant('kButtonOk'),
+            cancelText: $translate.instant('kButtonCancel'),
         });
 
         $rootScope.zmPopup.then(function(res)
@@ -87,7 +89,9 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
         $ionicPopup.confirm(
             {
                 title: $translate.instant('kSensitiveTitle'),
-                template: $rootScope.appName + ' ' + $translate.instant('kSensitiveBody')
+                template: $rootScope.appName + ' ' + $translate.instant('kSensitiveBody'),
+                okText: $translate.instant('kButtonOk'),
+                cancelText: $translate.instant('kButtonCancel'),
             })
             .then(function(res)
             {
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index 571c4d37..31471ea4 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -80,7 +80,9 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
             $rootScope.zmPopup = SecuredPopups.show('alert',
             {
                 title: $translate.instant('kError'),
-                template: $translate.instant('kFallback2Configs')
+                template: $translate.instant('kFallback2Configs'),
+                okText: $translate.instant('kButtonOk'),
+                cancelText: $translate.instant('kButtonCancel'),
             });
             return;
 
@@ -711,7 +713,9 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                                                 $rootScope.zmPopup = SecuredPopups.show('alert',
                                                 {
                                                     title: $translate.instant('kLoginValidatedTitle'),
-                                                    template: loginStatus
+                                                    template: loginStatus,
+                                                    okText: $translate.instant('kButtonOk'),
+                                                    cancelText: $translate.instant('kButtonCancel'),
                                                 }).then(function(res)
                                                 {
 
@@ -736,7 +740,9 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                                                 $rootScope.zmPopup = SecuredPopups.show('alert',
                                                 {
                                                     title: $translate.instant('kLoginValidatedTitle'),
-                                                    template: loginStatus
+                                                    template: loginStatus,
+                                                    okText: $translate.instant('kButtonOk'),
+                                                    cancelText: $translate.instant('kButtonCancel'),
                                                 }).then(function(res)
                                                 {
 
@@ -771,7 +777,9 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                             $rootScope.zmPopup = SecuredPopups.show('alert',
                             {
                                 title: $translate.instant('kLoginValidAPIFailedTitle'),
-                                template: $translate.instant('kBannerPleaseCheck')
+                                template: $translate.instant('kBannerPleaseCheck'),
+                                okText: $translate.instant('kButtonOk'),
+                                cancelText: $translate.instant('kButtonCancel'),
                             });
                         });
                 });
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 29449ddc..364daf08 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1061,7 +1061,9 @@ angular.module('zmApp.controllers')
                 $rootScope.zmPopup = $ionicPopup.alert(
                 {
                     title: $translate.instant('kError'),
-                    template: $translate.instant('kMontageNoSavedProfiles')
+                    template: $translate.instant('kMontageNoSavedProfiles'),
+                    okText: $translate.instant('kButtonOk'),
+                    cancelText: $translate.instant('kButtonCancel'),
                 });
                 return;
             }
@@ -1081,6 +1083,8 @@ angular.module('zmApp.controllers')
                 title: $translate.instant('kSelect'),
                 subTitle:$translate.instant('kSelectDelete'),
                 scope: $scope,
+                okText: $translate.instant('kButtonOk'),
+                cancelText: $translate.instant('kButtonCancel'),
 
             }).then(function(res)
             {
@@ -1149,6 +1153,9 @@ angular.module('zmApp.controllers')
                 title: $translate.instant('kSelect'),
                 subTitle:$translate.instant('kSelectSwitch'),
                 scope: $scope,
+                okText: $translate.instant('kButtonOk'),
+                cancelText: $translate.instant('kButtonCancel'),
+                    
 
             }).then(function(res)
             {
@@ -1187,6 +1194,8 @@ angular.module('zmApp.controllers')
                 template: "<input autocapitalize='none' autocomplete='off' autocorrect='off' type='text' ng-model='data.montageName'>",
                 subTitle: $translate.instant('kMontageSaveSubtitle'),
                 scope: $scope,
+                okText: $translate.instant('kButtonOk'),
+                cancelText: $translate.instant('kButtonCancel'),
 
             }).then(function(res)
             {
@@ -1327,7 +1336,9 @@ angular.module('zmApp.controllers')
                 $rootScope.zmPopup = $ionicPopup.alert(
                 {
                     title: $translate.instant('kNoMonitors'),
-                    template: $translate.instant('kCheckCredentials')
+                    template: $translate.instant('kCheckCredentials'),
+                    okText: $translate.instant('kButtonOk'),
+                    cancelText: $translate.instant('kButtonCancel'),
                 });
                 $ionicHistory.nextViewOptions(
                 {
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index ab902973..4c7851d5 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -1377,7 +1377,9 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
             $rootScope.zmPopup = $ionicPopup.alert(
             {
                 title: $translate.instant('kNoMonitors'),
-                template: $translate.instant('kPleaseCheckCredentials')
+                template: $translate.instant('kPleaseCheckCredentials'),
+                okText: $translate.instant('kButtonOk'),
+                cancelText: $translate.instant('kButtonCancel'),
             });
             $ionicHistory.nextViewOptions(
             {
diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js
index 54a2c4c9..4faec748 100644
--- a/www/js/StateCtrl.js
+++ b/www/js/StateCtrl.js
@@ -339,7 +339,9 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
             $ionicPopup.alert(
             {
                 title: $translate.instant('kOperationInProgressTitle'),
-                template: $translate.instant('kOperationInProgressBody') + '...'
+                template: $translate.instant('kOperationInProgressBody') + '...',
+                okText: $translate.instant('kButtonOk'),
+                cancelText: $translate.instant('kButtonCancel'),
             });
             return;
         }
@@ -354,15 +356,15 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
 
         $rootScope.zmPopup = $ionicPopup.show(
         {
-            title: 'Please Confirm',
+            title: $translate.instant('kPleaseConfirm'),
             template: promptstring,
             buttons: [
             {
-                text: 'Cancel',
+                text: $translate.instant('kButtonCancel'),
                 type: 'button-positive'
             },
             {
-                text: 'Yes',
+                text: $translate.instant('kButtonOk'),
                 type: 'button-assertive',
                 onTap: function(e)
                 {
diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js
index 6bf0822b..506c6efa 100644
--- a/www/js/TimelineModalCtrl.js
+++ b/www/js/TimelineModalCtrl.js
@@ -139,7 +139,9 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
         {
             title: 'frame:' + fid + '/Event:' + e,
             template: img,
-            cssClass: 'popup95'
+            cssClass: 'popup95',
+            okText: $translate.instant('kButtonOk'),
+            cancelText: $translate.instant('kButtonCancel'),
         });
     };
 
diff --git a/www/js/app.js b/www/js/app.js
index 4de2426f..d07d0e5d 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -975,7 +975,9 @@ angular.module('zmApp', [
                                     var alertPopup = $ionicPopup.alert(
                                     {
                                         title: 'reCaptcha enabled',
-                                        template: $translate.instant('kRecaptcha')
+                                        template: $translate.instant('kRecaptcha'),
+                                        okText: $translate.instant('kButtonOk'),
+                                        cancelText: $translate.instant('kButtonCancel'),
                                     });
 
                                     // close it after 5 seconds