From 1f400aade8a4aa10c25eec42324db55e221eae3e Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Mon, 21 Aug 2023 17:08:52 +0100
Subject: [PATCH 1/3] Improve formatting of name change form

* Add line breaks between html tags
* Use double quotes where the string includes a single quote
---
 app/views/users/names/edit.html.erb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/users/names/edit.html.erb b/app/views/users/names/edit.html.erb
index e363b8dde2..27cff493ed 100644
--- a/app/views/users/names/edit.html.erb
+++ b/app/views/users/names/edit.html.erb
@@ -7,15 +7,18 @@
     <%= _('When you send a request, we use the name you gave us. This makes ' \
           'it hard to stop your old and new names from being connected.') %>
   </p>
+
   <p>
-    <%= _('If you change your name, your old requests won\'t change. Your ' \
-          'old name will still show up on requests that you\'ve already sent ' \
-          'and on your public profile page.') %>
+    <%= _("If you change your name, your old requests won't change. Your " \
+          "old name will still show up on requests that you've already sent " \
+          "and on your public profile page.") %>
   </p>
+
   <p>
-    <%= _('If you don\'t want your new name to be linked to your old one, ' \
-          'it\'s a good idea to make a new account instead.') %>
+    <%= _("If you don't want your new name to be linked to your old one, " \
+          "it's a good idea to make a new account instead.") %>
   </p>
+
   <p>
     <%= _('If you are trying to remove your name, please
           <a href="{{contact_us_url}}">contact us</a>.',

From 6d4f1a6cdd990ca4eed12b3c56fa883ea714243c Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Mon, 21 Aug 2023 17:20:45 +0100
Subject: [PATCH 2/3] Improve phrasing of user name change notes

Improve clarity by emphasising the three situations that a user may be
in and combine the text around the default first case into a single
block.
---
 app/views/users/names/edit.html.erb | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/views/users/names/edit.html.erb b/app/views/users/names/edit.html.erb
index 27cff493ed..b8a1216cf6 100644
--- a/app/views/users/names/edit.html.erb
+++ b/app/views/users/names/edit.html.erb
@@ -4,23 +4,22 @@
 
 <div id="notice">
   <p>
-    <%= _('When you send a request, we use the name you gave us. This makes ' \
-          'it hard to stop your old and new names from being connected.') %>
+    <%= _("<strong>If you change your name, the name on your old requests " \
+          "won't change.</strong> When you send a request, we use the name " \
+          "you gave us. This makes it hard to stop your old and new names " \
+          "from being connected. This means your old name will still show up " \
+          "on requests that you've already sent and on your public profile " \
+          "page.")
+    %>
   </p>
 
   <p>
-    <%= _("If you change your name, your old requests won't change. Your " \
-          "old name will still show up on requests that you've already sent " \
-          "and on your public profile page.") %>
-  </p>
-
-  <p>
-    <%= _("If you don't want your new name to be linked to your old one, " \
+    <%= _("If you <strong>don't want your new name to be linked to your old one</strong>, " \
           "it's a good idea to make a new account instead.") %>
   </p>
 
   <p>
-    <%= _('If you are trying to remove your name, please
+    <%= _('If you are trying to <strong>remove your name</strong>, please
           <a href="{{contact_us_url}}">contact us</a>.',
           contact_us_url: help_contact_path) %>
   </p>

From 0465c455c186910a7a4daeaf04efe5b2b2b958da Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Mon, 21 Aug 2023 17:24:25 +0100
Subject: [PATCH 3/3] Add note on reindexing requests after name change
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A user contacted us surprised that their requests “disappeared” after
changing their account name [1]. This is due to the user profile page
being driven by Xapian and needing the updated url_name to get indexed.

[1] https://groups.google.com/a/mysociety.org/g/alaveteli-dev-private/c/4lydZfHOlx4/m/S45pzDbyAQAJ
---
 app/views/users/names/edit.html.erb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/views/users/names/edit.html.erb b/app/views/users/names/edit.html.erb
index b8a1216cf6..a1dc573781 100644
--- a/app/views/users/names/edit.html.erb
+++ b/app/views/users/names/edit.html.erb
@@ -38,4 +38,9 @@
       <%= submit_tag _('Change your name') %>
     </div>
   <% end %>
+
+  <p>
+    <%= _('Note that it may take some time to link your previous requests to ' \
+          'your new account name.') %>
+  </p>
 </div>