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

UX: add the word it's before standard spam names to form a complete sentence

Browse Source
This commit is contained in:
Régis Hanol 2014-11-05 22:46:07 +01:00
parent d104b72aee
commit 3d94808c00
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/controllers/flag-action-type.js.es6
View File

@ -18,8 +18,12 @@ export default ObjectController.extend({
}.property('name_key'), }.property('name_key'),
formattedName: function(){ formattedName: function(){
return this.get('name').replace("{{username}}", this.get('controllers.flag.username')); if (this.get("is_custom_flag")) {
}.property('name'), return this.get('name').replace("{{username}}", this.get('controllers.flag.username'));
} else {
return I18n.t("flagging.formatted_name." + this.get('name_key'));
}
}.property('name', 'name_key', 'is_custom_flag'),
selected: function() { selected: function() {
return this.get('model') === this.get('controllers.flag.selected'); return this.get('model') === this.get('controllers.flag.selected');

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

@ -1324,6 +1324,10 @@ en:
submit_tooltip: "Submit the private flag" submit_tooltip: "Submit the private flag"
take_action_tooltip: "Reach the flag threshold immediately, rather than waiting for more community flags" take_action_tooltip: "Reach the flag threshold immediately, rather than waiting for more community flags"
cant: "Sorry, you can't flag this post at this time." cant: "Sorry, you can't flag this post at this time."
formatted_name:
off_topic: "It's Off-Topic"
inappropriate: "It's Inappropriate"
spam: "It's Spam"
custom_placeholder_notify_user: "Why does this post require you to speak to this user directly and privately? Be specific, be constructive, and always be kind." custom_placeholder_notify_user: "Why does this post require you to speak to this user directly and privately? Be specific, be constructive, and always be kind."
custom_placeholder_notify_moderators: "Why does this post require moderator attention? Let us know specifically what you are concerned about, and provide relevant links where possible." custom_placeholder_notify_moderators: "Why does this post require moderator attention? Let us know specifically what you are concerned about, and provide relevant links where possible."
custom_message: custom_message: