FIX: Only confirm bookmark delete if a reminder has been set (#9484)

FIX: Only confirm bookmark delete if a reminder has been set (#9484)

We do not need a secondary bootbox confirm if the bookmark has no reminder, because nothing really will be lost in that case.

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 9f630ee..604a6f2 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -436,17 +436,25 @@ export default Controller.extend(ModalFunctionality, {
 
     delete() {
       this._deleting = true;
-      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
-        if (result) {
-          this._closeWithoutSaving = true;
-          this._deleteBookmark()
-            .then(() => {
-              this._deleting = false;
-              this.send("closeModal");
-            })
-            .catch(e => this._handleSaveError(e));
-        }
-      });
+      let deleteAction = () => {
+        this._closeWithoutSaving = true;
+        this._deleteBookmark()
+          .then(() => {
+            this._deleting = false;
+            this.send("closeModal");
+          })
+          .catch(e => this._handleSaveError(e));
+      };
+
+      if (this._existingBookmarkHasReminder()) {
+        bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
+          if (result) {
+            deleteAction();
+          }
+        });
+      } else {
+        deleteAction();
+      }
     },
 
     closeWithoutSavingBookmark() {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 947f19c..1d881a1 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -312,7 +312,7 @@ en:
       created_with_at_desktop_reminder: "you've bookmarked this post and will be reminded next time you are at your desktop"
       remove: "Remove Bookmark"
       delete: "Delete Bookmark"
-      confirm_delete: "Are you sure you want to delete this bookmark? If you set a reminder it will also be deleted."
+      confirm_delete: "Are you sure you want to delete this bookmark? The reminder will also be deleted."
       confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
       save: "Save"
       no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up <a href="%{basePath}/my/preferences/profile">in your profile</a>.'

GitHub sha: d123138d

This commit appears in #9484 which was merged by martin.