github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-17 20:22:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

clarification on delete and block

Browse Source
This commit is contained in:
Jeff Atwood 2014-08-12 03:14:50 -07:00
parent c187196cd5
commit 506162b719
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/models/admin_user.js
View File

@ -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);

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

@ -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"