diff options
| author | Dave Whiteland <dave@mysociety.org> | 2013-02-06 15:08:23 +0000 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2013-02-06 15:08:23 +0000 |
| commit | 0f24a44cd6e8b056db482cb91c85768b6d1e7d1d (patch) | |
| tree | 09a90f38574ee62754f3c8ac077152ed99a38296 /templates/web/default/auth | |
| parent | c061769ba72f420e2f2c6064fa526648e57339f1 (diff) | |
| parent | 5b2e18389734751165d2eeb21a3b3f2e8d2e8755 (diff) | |
Merge remote branch 'origin/master' into oxfordshire-header
Diffstat (limited to 'templates/web/default/auth')
| -rw-r--r-- | templates/web/default/auth/sign_out.html | 3 | ||||
| -rw-r--r-- | templates/web/default/auth/token.html | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/templates/web/default/auth/sign_out.html b/templates/web/default/auth/sign_out.html index 23d39aa2d..571e13f9f 100644 --- a/templates/web/default/auth/sign_out.html +++ b/templates/web/default/auth/sign_out.html @@ -2,7 +2,6 @@ <h1>[% loc('You have been signed out') %]</h1> -<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>, or -go back to the <a href="/">FixMyStreet front page</a>.</p> +<p>[% tprintf( loc('Please feel free to <a href="%s">sign in again</a>, or go back to the <a href="/">front page</a>.'), c.uri_for('/auth') ) %]</p> [% INCLUDE 'footer.html' %] diff --git a/templates/web/default/auth/token.html b/templates/web/default/auth/token.html index 0f44d1074..5fa69ab21 100644 --- a/templates/web/default/auth/token.html +++ b/templates/web/default/auth/token.html @@ -18,7 +18,9 @@ <p>[% loc("We have sent you an email containing a link to confirm your account.") %]</p> +[% IF c.cobrand.moniker != 'zurich' %] <p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <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> |