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

some minor user deletion tweaks

This commit is contained in:
Jeff Atwood 2013-08-13 00:41:23 -07:00
parent b36c6d7b78
commit 6722a1fe22
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/site_setting.rb
View File

@ -237,7 +237,7 @@ class SiteSetting < ActiveRecord::Base
client_setting(:relative_date_duration, 14) client_setting(:relative_date_duration, 14)
client_setting(:delete_user_max_age, 7) client_setting(:delete_user_max_age, 14)
setting(:delete_all_posts_max, 10) setting(:delete_all_posts_max, 10)
setting(:username_change_period, 3) # days setting(:username_change_period, 3) # days

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

@ -1271,9 +1271,9 @@ en:
delete_forbidden: delete_forbidden:
one: "Users can't be deleted if they registered more than %{count} day ago, or if they have posts. Delete all posts before trying to delete a user." one: "Users can't be deleted if they registered more than %{count} day ago, or if they have posts. Delete all posts before trying to delete a user."
other: "Users can't be deleted if they registered more than %{count} days ago, or if they have posts. Delete all posts before trying to delete a user." other: "Users can't be deleted if they registered more than %{count} days ago, or if they have posts. Delete all posts before trying to delete a user."
delete_confirm: "Are you SURE you want to permanently delete this user from the site? This action is permanent!" 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> signups with the same email address" delete_and_block: "<b>Yes</b>, and <b>block</b> any future signup attempts with this email address"
delete_dont_block: "<b>Yes</b>, and <b>allow</b> signups with the same email address" delete_dont_block: "<b>Yes</b>, but <b>allow</b> future signups with this email address"
deleted: "The user was deleted." 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." 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" send_activation_email: "Send Activation Email"