aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/base
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/base')
-rw-r--r--templates/web/base/auth/token.html17
-rw-r--r--templates/web/base/email_sent.html25
2 files changed, 13 insertions, 29 deletions
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>