From 506162b719023a4c9f4fec538f20b34345e49c64 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Tue, 12 Aug 2014 03:14:50 -0700
Subject: [PATCH] clarification on delete and block
---
app/assets/javascripts/admin/models/admin_user.js | 4 ++--
config/locales/client.en.yml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/assets/javascripts/admin/models/admin_user.js b/app/assets/javascripts/admin/models/admin_user.js
index 3ce78ea65..5cf501051 100644
--- a/app/assets/javascripts/admin/models/admin_user.js
+++ b/app/assets/javascripts/admin/models/admin_user.js
@@ -333,13 +333,13 @@ Discourse.AdminUser = Discourse.User.extend({
"class": "cancel",
"link": true
}, {
- "label": '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t('admin.user.delete_dont_block'),
+ "label": I18n.t('admin.user.delete_dont_block'),
"class": "btn",
"callback": function(){
performDestroy(false);
}
}, {
- "label": '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t('admin.user.delete_and_block'),
+ "label": '<i class="fa fa-exclamation-triangle"></i>' + I18n.t('admin.user.delete_and_block'),
"class": "btn btn-danger",
"callback": function(){
performDestroy(true);
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4fb304533..f258dd61c 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1874,9 +1874,9 @@ en:
cant_delete_all_too_many_posts:
one: "Can't delete all posts because the user has more than 1 post. (delete_all_posts_max)"
other: "Can't delete all posts because the user has more than %{count} posts. (delete_all_posts_max)"
- delete_confirm: "Are you SURE you want to delete this user? This action is permanent!"
- delete_and_block: "<b>Yes</b>, and <b>block</b> future signups from this email and IP address"
- delete_dont_block: "<b>Yes</b>, just delete the user"
+ delete_confirm: "Are you SURE you want to delete this user? This is permanent!"
+ delete_and_block: "Delete and <b>block</b> this email and IP address"
+ delete_dont_block: "Delete only"
deleted: "The user was deleted."
delete_failed: "There was an error deleting that user. Make sure all posts are deleted before trying to delete the user."
send_activation_email: "Send Activation Email"