diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2011-07-01 14:18:32 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2011-07-01 14:18:32 +0100 |
| commit | b054065d6b1025e97b1a19e8a69280954253599d (patch) | |
| tree | b71d14faac8711e6b8c7a5dea30414e82841e1d0 | |
| parent | a010a31a65d6ff3da49d7d85b1dd5a9300c3c92d (diff) | |
Update error message.
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/Update.pm | 2 | ||||
| -rw-r--r-- | t/app/controller/report_updates.t | 2 | ||||
| -rw-r--r-- | templates/web/default/auth/general.html | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index a18e36bfd..78c9b5ae0 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -573,7 +573,7 @@ sub process_user : Private { # The user is trying to sign in. We only care about email from the params. if ( $c->req->param('submit_sign_in') || $c->req->param('password_sign_in') ) { unless ( $c->forward( '/auth/sign_in' ) ) { - $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. Please try again.'); + $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet – please fill in the right hand side of this form to get one.'); return 1; } my $user = $c->user->obj; diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm index 85a29c2ea..2abe65b1f 100644 --- a/perllib/FixMyStreet/App/Controller/Report/Update.pm +++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm @@ -114,7 +114,7 @@ sub process_user : Private { # The user is trying to sign in. We only care about email from the params. if ( $c->req->param('submit_sign_in') || $c->req->param('password_sign_in') ) { unless ( $c->forward( '/auth/sign_in', [ $email ] ) ) { - $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. Please try again.'); + $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet – please fill in the right hand side of this form to get one.'); return 1; } my $user = $c->user->obj; diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index 9a3cb3947..3b53e6c46 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -415,7 +415,7 @@ for my $test ( password_sign_in => 'secret', }, field_errors => [ - 'There was a problem with your email/password combination. Please try again.', + "There was a problem with your email/password combination. Passwords and user accounts are a brand new service, so you probably do not have one yet \x{2013} please fill in the right hand side of this form to get one.", 'Please enter your name', # FIXME Not really necessary error ], }, diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index 5f9a09199..234aadf52 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -20,7 +20,7 @@ [% IF loc_email_error %] <div class="form-error">[% loc_email_error %]</div> [% ELSIF sign_in_error %] - <div class="form-error">[% loc('There was a problem with your email/password combination. Please try again.') %]</div> + <div class="form-error">[% loc('There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet – please fill in the right hand side of this form to get one.') %]</div> [% END %] <div class="form-field"> |