From 89a3c0b09d9a7b9a766838f46a426fb457011e21 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Tue, 24 Mar 2020 17:22:48 -0500
Subject: [PATCH] users: update explanation on account deactivation page.

* Refer to it as deactivating your account, not deleting your account.
* Update explanation to clarify what is and is not deleted.
* Warn that deactivation cannot be undone.
---
 .../maintenance/user/deletions/show.html.erb  | 35 ++++++++++++++-----
 app/views/static/site_map.html.erb            |  1 -
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/views/maintenance/user/deletions/show.html.erb b/app/views/maintenance/user/deletions/show.html.erb
index d7daf190e..e7ded1d06 100644
--- a/app/views/maintenance/user/deletions/show.html.erb
+++ b/app/views/maintenance/user/deletions/show.html.erb
@@ -1,19 +1,36 @@
-<% page_title "Delete Account" %>
+<% page_title "Deactivate Account" %>
 
 <div id="c-maintenance-user-deletions">
   <div id="a-show" class="prose">
-    <h1>Delete Account</h1>
+    <h1>Deactivate Account</h1>
 
-    <p>You can delete your account. This will not actually remove your account from the database, but it will do the following things:</p>
+    <p>
+      You can deactivate your <%= Danbooru.config.app_name %> account using
+      the form below. Deactivating your account will do the following things:
+    </p>
 
     <ul>
-      <li>Rename your account to a generic string</li>
-      <li>Scramble your password</li>
-      <li>Remove all your favorites</li>
-      <li>Blank out your settings (including email)</li>
+      <li>Change your name to a generic name</li>
+      <li>Delete your favorites</li>
+      <li>Delete your saved searches</li>
+      <li>Delete your password and email address</li>
+      <li>Delete your account settings</li>
     </ul>
 
-    <p>You must enter your password to delete your account.</p>
+    <p>
+      The following things will <strong>not</strong> be deleted:
+    </p>
+
+    <ul>
+      <li>Posts you've uploaded</li>
+      <li>Comments, forum posts, and private messages</li>
+      <li>Tag edits, wiki edits, translation notes, or any other contributions to the site</li>
+    </ul>
+
+    <p>
+      Enter your password below to deactivate your account. This cannot be
+      undone. Your account cannot be recovered after it is deactivated.
+    </p>
 
     <%= form_tag(maintenance_user_deletion_path, :method => :delete, :class => "simple_form") do %>
       <div class="input">
@@ -22,7 +39,7 @@
       </div>
 
       <div class="input">
-        <%= submit_tag "Submit" %>
+        <%= submit_tag "Deactivate account" %>
       </div>
     <% end %>
   </div>
diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb
index e3ee6b7fc..078b9ec7d 100644
--- a/app/views/static/site_map.html.erb
+++ b/app/views/static/site_map.html.erb
@@ -122,7 +122,6 @@
           <% if policy(UserNameChangeRequest).create? %>
             <li><%= link_to "Change name", new_user_name_change_request_path %></li>
           <% end %>
-          <li><%= link_to "Delete account", maintenance_user_deletion_path %></li>
           <li><%= link_to "Dmails", dmails_path(search: { folder: "received" }) %></li>
           <li><%= link_to "Favorites", favorites_path %></li>
           <li><%= link_to "Favorite groups", favorite_groups_path %></li>