diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
index f7ae397e82..57c09e39e0 100644
--- a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
@@ -58,16 +58,17 @@ export default ObjectController.extend(ModalFunctionality, {
this._forwardAction(action);
} else {
this.send("hideModal");
- const message = I18n.t("topic.feature_topic.confirm_" + name, { count: count });
bootbox.confirm(
- message, I18n.t("no_value"), I18n.t("yes_value"),
- (confirmed) => confirmed ? this._forwardAction(action) : this.send("reopenModal")
+ I18n.t("topic.feature_topic.confirm_" + name, { count: count }),
+ I18n.t("no_value"),
+ I18n.t("yes_value"),
+ confirmed => confirmed ? this._forwardAction(action) : this.send("reopenModal")
);
}
},
actions: {
- pin() { this._confirmBeforePinning(this.get("pinnedInCategoryCount"), "pin", "togglePinned"); },
+ pin() { this._forwardAction("togglePinned"); },
pinGlobally() { this._confirmBeforePinning(this.get("pinnedGloballyCount"), "pin_globally", "pinGlobally"); },
unpin() { this._forwardAction("togglePinned"); },
makeBanner() { this._forwardAction("makeBanner"); },
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 8a40413bab..a2586b7ac9 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1021,7 +1021,7 @@ en:
feature_topic:
title: "Feature this topic"
pin: "Make this topic appear at the top of the {{categoryLink}} category."
- confirm_pin: "Are you sure? You already have {{count}} pinned topics -- too many pinned topics can obscure other active topics."
+ confirm_ping: "You already have {{count}} pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic in this category?"
unpin: "Remove this topic from the topic of the {{categoryLink}} category."
pin_note: "Users can unpin the topic individually for themselves."
already_pinned:
@@ -1029,7 +1029,7 @@ en:
one: "Topic currently pinned in {{categoryLink}}: 1."
other: "Topics currently pinned in {{categoryLink}}: {{count}}."
pin_globally: "Make this topic appear at the top of all topic lists, until a staff member unpins it."
- confirm_pin_globally: "Are you sure? You already have {{count}} globally pinned topics -- too many pinned topics can obscure other active topics."
+ confirm_pin_globally: "You already have {{count}} globally pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic globally?"
unpin_globally: "Remove this topic from the top of all topic lists."
global_pin_note: "Users can unpin the topic individually for themselves."
already_pinned_globally: