diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index 320ecaa3a3e..0187be422c5 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -237,7 +237,7 @@ class SiteSetting < ActiveRecord::Base 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(:username_change_period, 3) # days diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index b83b89a5e12..87a50ee59d0 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1271,9 +1271,9 @@ en: 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." 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_and_block: "Yes, and block signups with the same email address" - delete_dont_block: "Yes, and allow signups with the same email address" + delete_confirm: "Are you SURE you want to delete this user? This action is permanent!" + delete_and_block: "Yes, and block any future signup attempts with this email address" + delete_dont_block: "Yes, but allow future signups with this email address" 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"