IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 18:24:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: only nag when pinning globally

Browse Source
This commit is contained in:
Régis Hanol 2015-03-19 20:05:03 +01:00
parent 11bf7da63c
commit 28c0f9dd1f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/controllers/feature-topic.js.es6
View File

@ -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"); },

4
config/locales/client.en.yml
View File

@ -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}}: <strong>1.</strong>"
other: "Topics currently pinned in {{categoryLink}}: <strong>{{count}}</strong>."
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: