(js) Improve confirm dialogs for deletions

NEWS

@@ -7,6 +7,7 @@ Enhancements
  - [web] don't offer forward/vacation options in filters if not enabled
  - [web] mail filters are now sortable
  - [web] now supports RFC6154 and NoInferiors IMAP flag
+ - [web] improved confirm dialogs for deletions
 
 Bug fixes
  - [web] handle birthday dates before 1970

UI/WebServerResources/js/Contacts/AddressBookController.js

@@ -89,7 +89,8 @@
     
     function confirmDeleteSelectedCards() {
       Dialog.confirm(l('Warning'),
-                     l('Are you sure you want to delete the selected contacts?'))
+                     l('Are you sure you want to delete the selected contacts?'),
+                     { ok: l('Delete') })
         .then(function() {
           // User confirmed the deletion
           var selectedCards = _.filter(vm.selectedFolder.cards, function(card) { return card.selected; });

UI/WebServerResources/js/Contacts/AddressBooksController.js

@@ -97,7 +97,8 @@
       }
       else {
         Dialog.confirm(l('Warning'), l('Are you sure you want to delete the addressbook <em>%{0}</em>?',
-                                       vm.service.selectedFolder.name))
+                                       vm.service.selectedFolder.name),
+                       { ok: l('Delete') })
           .then(function() {
             return vm.service.selectedFolder.$delete();
           })

UI/WebServerResources/js/Contacts/CardController.js

@@ -121,7 +121,7 @@
     function confirmDelete(card) {
       Dialog.confirm(l('Warning'),
                      l('Are you sure you want to delete the card of %{0}?', card.$fullname()),
-                     {ok: l('Yes'), cancel: l('No')})
+                     { ok: l('Delete') })
         .then(function() {
           // User confirmed the deletion
           card.$delete()

UI/WebServerResources/js/Mailer/MailboxController.js

@@ -55,7 +55,8 @@
 
     function confirmDeleteSelectedMessages() {
       Dialog.confirm(l('Warning'),
-                     l('Are you sure you want to delete the selected messages?'))
+                     l('Are you sure you want to delete the selected messages?'),
+                     { ok: l('Delete') })
         .then(function() {
           var deleteSelectedMessage = false;
           var selectedMessages = _.filter(vm.selectedFolder.$messages, function(message) {

UI/WebServerResources/js/Scheduler/CalendarListController.js

@@ -76,7 +76,8 @@
 
     function confirmDeleteSelectedComponents() {
       Dialog.confirm(l('Warning'),
-                     l('Are you sure you want to delete the selected components?'))
+                     l('Are you sure you want to delete the selected components?'),
+                     { ok: l('Delete') })
         .then(function() {
           // User confirmed the deletion
           var components = _.filter(Component['$' + vm.componentType], function(component) { return component.selected; });

UI/WebServerResources/js/Scheduler/CalendarsController.js

@@ -97,7 +97,8 @@
           });
       }
       else {
-        Dialog.confirm(l('Warning'), l('Are you sure you want to delete the calendar <em>%{0}</em>?', folder.name))
+        Dialog.confirm(l('Warning'), l('Are you sure you want to delete the calendar <em>%{0}</em>?', folder.name),
+                       { ok: l('Delete') })
           .then(function() {
             folder.$delete()
               .then(function() {