Conciser text on the email confirmation pages.

It’s best if Zurich keeps the old text, so now they have their
own overrides for those template files.

7 files changed, 57 insertions, 71 deletions

diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index ac2ec20ac..777d733e2 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -11,7 +11,7 @@ foreach my $test (
     {
         email      => 'test@example.com',
         type       => 'area_problems',
-        content    => 'your alert will not be activated',
+        content    => 'Click the link in our confirmation email to activate your alert',
         email_text => "confirms that you'd like to receive an email",
         uri =>
 '/alert/subscribe?type=local&rznvy=test@example.com&feed=area:1000:A_Location',
@@ -20,7 +20,7 @@ foreach my $test (
     {
         email      => 'test@example.com',
         type       => 'council_problems',
-        content    => 'your alert will not be activated',
+        content    => 'Click the link in our confirmation email to activate your alert',
         email_text => "confirms that you'd like to receive an email",
         uri =>
 '/alert/subscribe?type=local&rznvy=test@example.com&feed=council:1000:A_Location',
@@ -30,7 +30,7 @@ foreach my $test (
     {
         email      => 'test@example.com',
         type       => 'ward_problems',
-        content    => 'your alert will not be activated',
+        content    => 'Click the link in our confirmation email to activate your alert',
         email_text => "confirms that you'd like to receive an email",
         uri =>
 '/alert/subscribe?type=local&rznvy=test@example.com&feed=ward:1000:1001:A_Location:Diff_Location',
@@ -40,7 +40,7 @@ foreach my $test (
     {
         email      => 'test@example.com',
         type       => 'local_problems',
-        content    => 'your alert will not be activated',
+        content    => 'Click the link in our confirmation email to activate your alert',
         email_text => "confirms that you'd like to receive an email",
         uri =>
 '/alert/subscribe?type=local&rznvy=test@example.com&feed=local:10.2:20.1',
@@ -50,7 +50,7 @@ foreach my $test (
     {
         email      => 'test@example.com',
         type       => 'new_updates',
-        content    => 'your alert will not be activated',
+        content    => 'Click the link in our confirmation email to activate your alert',
         email_text => "confirms that you'd like to receive an email",
         uri    => '/alert/subscribe?type=updates&rznvy=test@example.com&id=1',
         param1 => 1,
@@ -236,7 +236,7 @@ for my $test (
     {
         email      => 'test@example.com',
         type       => 'new_updates',
-        content    => 'your alert will not be activated',
+        content    => 'Click the link in our confirmation email to activate your alert',
         email_text => 'confirm the alert',
         uri    => '/alert/subscribe?type=updates&rznvy=test@example.com&id=1',
         param1 => 1,
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 3e3e4744a..6c6b4ca19 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -353,7 +353,7 @@ for my $test (
             'submit update'
         );
 
-        $mech->content_contains('Nearly Done! Now check your email');
+        $mech->content_contains('Nearly done! Now check your email');
 
         my $email = $mech->get_email;
         ok $email, "got an email";
@@ -1007,7 +1007,7 @@ subtest 'submit an update for a registered user, creating update by email' => su
         },
     }, 'submit update' );
 
-    $mech->content_contains('Nearly Done! Now check your email');
+    $mech->content_contains('Nearly done! Now check your email');
 
     # No change to user yet.
     $user->discard_changes;
diff --git a/templates/web/base/auth/token.html b/templates/web/base/auth/token.html
index b137f0e56..a4dedcec3 100644
--- a/templates/web/base/auth/token.html
+++ b/templates/web/base/auth/token.html
@@ -1,11 +1,12 @@
 [% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirm account') %]
 
 [% IF token_not_found %]
+[%# Shown whenever there's an invalid token, eg while confirming a report or logging in without a password %]
 
   <div class="confirmation-header confirmation-header--failure">
 
-    <h1>[% loc('We have not been able to confirm your account - sorry.') %]</h1>
-    <p>[% loc('This may be because the link is too old or already used, or the address was not copied correctly.') %]</p>
+    <h1>[% loc('Sorry, that wasn&rsquo;t a valid link') %]</h1>
+    <p>[% loc('The link might have expired, or maybe you didn&rsquo;t quite copy and paste it correctly.') %]</p>
 
   </div>
 
@@ -13,14 +14,12 @@
 
   <div class="confirmation-header confirmation-header--inbox">
 
-    <h1>[% loc('Please check your email') %]</h1>
-    <p>[% loc("We have sent you an email containing a link to confirm your account.") %]</p>
+    <h1>[% loc("Nearly done! Now check your email&hellip;") %]</h1>
+    <p>[% loc("Click the link in our confirmation email to sign in.") %]</p>
 
-  [% IF c.cobrand.moniker != 'zurich' %]
-    <p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient.") %]</p>
-  [% END %]
-
-    <p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p>
+    <p>
+        [% loc("Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time.") %]
+    </p>
 
   </div>
 
diff --git a/templates/web/base/email_sent.html b/templates/web/base/email_sent.html
index 3b442cfb5..7d38f9d67 100644
--- a/templates/web/base/email_sent.html
+++ b/templates/web/base/email_sent.html
@@ -2,36 +2,21 @@
 
 <div class="confirmation-header confirmation-header--inbox">
 
-    <h1>[% loc("Nearly Done! Now check your email...") %]</h1>
+    <h1>[% loc("Nearly done! Now check your email&hellip;") %]</h1>
 
-  [% IF c.cobrand.moniker != 'zurich' %]
-    <p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient.") %]</p>
-  [% END %]
-
-    <p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p>
-
-  [% IF c.cobrand.moniker != 'zurich' %]
     <p>
-    [% loc("You must now click the link in the email we've just sent you.") %]
     [% IF email_type == 'problem' %]
-        [% loc("If you do not, your problem will not be posted.") %]
+        [% loc("Click the link in our confirmation email to publish your problem.") %]
     [% ELSIF email_type == 'update' %]
-        [% loc("If you do not, your update will not be posted.") %]
+        [% loc("Click the link in our confirmation email to publish your update.") %]
     [% ELSIF email_type == 'alert' %]
-        [% loc("If you do not, your alert will not be activated.") %]
+        [% loc("Click the link in our confirmation email to activate your alert.") %]
     [% END %]
     </p>
 
     <p>
-    [% IF email_type == 'problem' %]
-        [% loc("(Don't worry &mdash; we'll hang on to your problem report while you're checking your email.)") %]
-    [% ELSIF email_type == 'update' %]
-        [% loc("(Don't worry &mdash; we'll hang on to your update while you're checking your email.)") %]
-    [% ELSIF email_type == 'alert' %]
-        [% loc("(Don't worry &mdash; we'll hang on to your alert while you're checking your email.)") %]
-    [% END %]
+        [% loc("Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time.") %]
     </p>
-  [% END %]
 
 </div>
 
diff --git a/templates/web/eastsussex/email_sent.html b/templates/web/eastsussex/email_sent.html
deleted file mode 100644
index f64a3cd64..000000000
--- a/templates/web/eastsussex/email_sent.html
+++ /dev/null
@@ -1,34 +0,0 @@
-[% INCLUDE 'header.html', bodyclass = 'twothirdswidthpage', title = loc('Create a report') %]
-
-<h1>[% loc("Nearly done! Now check your email&hellip;") %]</h1>
-
-[% IF c.cobrand.moniker != 'zurich' %]
-    <p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient.") %]</p>
-[% END %]
-
-<p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p>
-
-[% IF c.cobrand.moniker != 'zurich' %]
-    <p>
-    [% loc("You must now click the link in the email we've just sent you.") %]
-    [% IF email_type == 'problem' %]
-        [% loc("If you do not, your problem will not be posted.") %]
-    [% ELSIF email_type == 'update' %]
-        [% loc("If you do not, your update will not be posted.") %]
-    [% ELSIF email_type == 'alert' %]
-        [% loc("If you do not, your alert will not be activated.") %]
-    [% END %]
-    </p>
-
-    <p>
-    [% IF email_type == 'problem' %]
-        [% loc("(Don't worry &mdash; we'll hang on to your problem report while you're checking your email.)") %]
-    [% ELSIF email_type == 'update' %]
-        [% loc("(Don't worry &mdash; we'll hang on to your update while you're checking your email.)") %]
-    [% ELSIF email_type == 'alert' %]
-        [% loc("(Don't worry &mdash; we'll hang on to your alert while you're checking your email.)") %]
-    [% END %]
-    </p>
-[% END %]
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/zurich/auth/token.html b/templates/web/zurich/auth/token.html
new file mode 100644
index 000000000..e199691e0
--- /dev/null
+++ b/templates/web/zurich/auth/token.html
@@ -0,0 +1,25 @@
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirm account') %]
+
+[% IF token_not_found %]
+
+  <div class="confirmation-header confirmation-header--failure">
+
+    <h1>[% loc('We have not been able to confirm your account - sorry.') %]</h1>
+    <p>[% loc('This may be because the link is too old or already used, or the address was not copied correctly.') %]</p>
+
+  </div>
+
+[% ELSE %]
+
+  <div class="confirmation-header confirmation-header--inbox">
+
+    <h1>[% loc('Please check your email') %]</h1>
+    <p>[% loc("We have sent you an email containing a link to confirm your account.") %]</p>
+
+    <p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p>
+
+  </div>
+
+[% END %]
+
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/zurich/email_sent.html b/templates/web/zurich/email_sent.html
new file mode 100644
index 000000000..90bfcdbda
--- /dev/null
+++ b/templates/web/zurich/email_sent.html
@@ -0,0 +1,11 @@
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Create a report') %]
+
+<div class="confirmation-header confirmation-header--inbox">
+
+    <h1>[% loc("Nearly Done! Now check your email...") %]</h1>
+
+    <p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p>
+
+</div>
+
+[% INCLUDE 'footer.html' %]