Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

copyedits on new flagging behaviors

This commit is contained in:
Jeff Atwood 2014-07-31 16:17:31 -07:00
parent 49bf6f3075
commit 71aa41ccac
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/templates/modal/admin_delete_flag.js.handlebars
View File

@ -1,5 +1,5 @@
<button title="{{i18n admin.flags.delete_post_defer_flag_title}}" {{action deletePostDeferFlag}} class="btn"><i class="fa fa-trash-o"></i> {{i18n admin.flags.delete_post_defer_flag}}</button>
<button title="{{i18n admin.flags.delete_post_agree_flag_title}}" {{action deletePostAgreeFlag}} class="btn"><i class="fa fa-trash-o"></i> {{i18n admin.flags.delete_post_agree_flag}}</button>
<button title="{{i18n admin.flags.delete_post_defer_flag_title}}" {{action deletePostDeferFlag}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n admin.flags.delete_post_defer_flag}}</button>
<button title="{{i18n admin.flags.delete_post_agree_flag_title}}" {{action deletePostAgreeFlag}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.delete_post_agree_flag}}</button>
{{#if canDeleteAsSpammer}}
<button title="{{i18n admin.flags.delete_spammer_title}}" {{action deleteSpammer}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i> {{i18n admin.flags.delete_spammer}}</button>
{{/if}}

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

@ -1421,13 +1421,13 @@ en:
defer_flag_title: "No action is necessary at this time, defer any action on this flag until a later date, or never"
delete: "Delete"
delete_title: "Delete"
delete_post_defer_flag: "Delete Post and defer flag"
delete_post_defer_flag: "Delete Post and Defer flag"
delete_post_defer_flag_title: "Delete post; if the first post, delete the topic"
delete_post_agree_flag: "Delete Post and agree with flag"
delete_post_agree_flag: "Delete Post and Agree with flag"
delete_post_agree_flag_title: "Delete post; if the first post, delete the topic"
delete_flag_modal_title: "Choose the delete action"
delete_flag_modal_title: "Delete and..."
delete_spammer: "Delete Spammer"
delete_spammer_title: "Delete the user and all its posts and topics."
delete_spammer_title: "Remove the user and all posts and topics by this user."
disagree_flag_unhide_post: "Disagree (unhide post)"
disagree_flag_unhide_post_title: "Remove any flags from this post and make the post visible again"
disagree_flag: "Disagree"

10
config/locales/server.en.yml
View File

@ -1214,11 +1214,11 @@ en:
notify_moderators: "Your post was flagged **for moderator attention**: the community thinks something about the post requires moderator intervention."
flags_dispositions:
agreed: "Thanks for letting us know about this post. We've agreed with your flag."
agreed_and_deleted: "Thanks for letting us know about this post. We've agreed with your flag and deleted the post."
disagreed: "Thanks for letting us know about this post. We're currently looking into it."
defered: "Thanks for letting us know about this post. We're currently looking into it."
defered_and_deleted: "Thanks for letting us know about this post. We've agreed with your flag and deleted the post."
agreed: "Thanks for letting us know. We agree there is an issue and we're looking into it."
agreed_and_deleted: "Thanks for letting us know. We agree there is an issue and we've removed the post."
disagreed: "Thanks for letting us know. We're looking into it."
defered: "Thanks for letting us know. We're looking into it."
defered_and_deleted: "Thanks for letting us know. We've removed the post."
system_messages:
post_hidden: