From 71aa41ccacca0019b3bbf8a4af403c4787be341e Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 31 Jul 2014 16:17:31 -0700 Subject: [PATCH] copyedits on new flagging behaviors --- .../templates/modal/admin_delete_flag.js.handlebars | 4 ++-- config/locales/client.en.yml | 8 ++++---- config/locales/server.en.yml | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/admin/templates/modal/admin_delete_flag.js.handlebars b/app/assets/javascripts/admin/templates/modal/admin_delete_flag.js.handlebars index d4967a53ea..35689dd970 100644 --- a/app/assets/javascripts/admin/templates/modal/admin_delete_flag.js.handlebars +++ b/app/assets/javascripts/admin/templates/modal/admin_delete_flag.js.handlebars @@ -1,5 +1,5 @@ - - + + {{#if canDeleteAsSpammer}} {{/if}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index e0b73f670f..449a981a62 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -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" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 4782c86017..e97675c582 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -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: