From e0108088eee9a21a2e424b1cacf3a1af5dbf3c43 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 14 Dec 2016 16:39:21 -0500
Subject: [PATCH] (js) Rename buttons of alarm toast

Fixes #3945
---
 NEWS                                            |  1 +
 UI/Common/English.lproj/Localizable.strings     | 17 +++++++++--------
 .../js/Common/Alarm.service.js                  | 12 ++++++------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index e154b3c2d..bda371f79 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ New features
 
 Enhancements
  - [web] prevent using localhost on additional IMAP accounts
+ - [web] renamed buttons of alarm toast (#3945)
 
 Bug fixes
  - [web] fixed confusion between owner and active user in ACLs management of Administration module
diff --git a/UI/Common/English.lproj/Localizable.strings b/UI/Common/English.lproj/Localizable.strings
index e7107095b..9c68c9bb8 100644
--- a/UI/Common/English.lproj/Localizable.strings
+++ b/UI/Common/English.lproj/Localizable.strings
@@ -69,14 +69,6 @@
 "delegate is organizer" = "The delegate is the organizer. Please specify a different delegate.";
 "delegate is a participant" = "The delegate is already a participant.";
 "delegate is a group" = "The specified address corresponds to a group. You can only delegate to a unique person.";
-"Snooze for " = "Snooze for ";
-"5 minutes" = "5 minutes";
-"10 minutes" = "10 minutes";
-"15 minutes" = "15 minutes";
-"30 minutes" = "30 minutes";
-"45 minutes" = "45 minutes";
-"1 hour" = "1 hour";
-"1 day" = "1 day";
 
 /* common buttons */
 "OK" = "OK";
@@ -89,6 +81,15 @@
 "Start" = "Start";
 "Due Date" = "Due Date";
 "Location" = "Location";
+"Snooze" = "Snooze";
+"Snooze for " = "Snooze for ";
+"5 minutes" = "5 minutes";
+"10 minutes" = "10 minutes";
+"15 minutes" = "15 minutes";
+"30 minutes" = "30 minutes";
+"45 minutes" = "45 minutes";
+"1 hour" = "1 hour";
+"1 day" = "1 day";
 
 /* mail labels */
 "Important" = "Important";
diff --git a/UI/WebServerResources/js/Common/Alarm.service.js b/UI/WebServerResources/js/Common/Alarm.service.js
index 36845918a..96b901d8c 100644
--- a/UI/WebServerResources/js/Common/Alarm.service.js
+++ b/UI/WebServerResources/js/Common/Alarm.service.js
@@ -94,11 +94,11 @@
           '           </md-option>',
           '         </md-select>',
           '        </md-input-container>',
-          '        <md-button ng-click="cancel()">',
-                     l('Cancel'),
+          '        <md-button ng-click="snooze()">',
+                     l('Snooze'),
           '        </md-button>',
-          '        <md-button ng-click="ok()">',
-                     l('Ok'),
+          '        <md-button ng-click="close()">',
+                     l('Close'),
           '        </md-button>',
           '      </div>',
           '    </div>',
@@ -118,10 +118,10 @@
       function AlarmController(scope, $mdToast, url) {
         scope.summary = data.summary;
         scope.reminder = '10';
-        scope.cancel = function() {
+        scope.close = function() {
           $mdToast.hide();
         };
-        scope.ok = function() {
+        scope.snooze = function() {
           _this.$$resource.fetch(url, 'view?snoozeAlarm=' + scope.reminder);
           $mdToast.hide();
         };