Add note about confirmation to login errors

Just to make it obvious you need to click the confirmation link to set
activate the password

Fixes #124

4 files changed, 12 insertions, 10 deletions

diff --git a/locale/FixMyStreetMobileApp.po b/locale/FixMyStreetMobileApp.po
index b2821da..3d52a13 100644
--- a/locale/FixMyStreetMobileApp.po
+++ b/locale/FixMyStreetMobileApp.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: struan@mysociety.org\n"
-"POT-Creation-Date: 2013-09-12 10:13+0100\n"
+"POT-Creation-Date: 2013-09-12 10:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -354,7 +354,7 @@ msgid "There was a problem checking we cover this location. Please try again lat
 msgstr ""
 
 #: templates/strings.js:25
-msgid "There was a problem logging you in. Please check your email and password"
+msgid "There was a problem logging you in. Please check your email and password and that you have confirmed your password."
 msgstr ""
 
 #: templates/strings.js:23
@@ -386,7 +386,7 @@ msgid "There was a problem uploading your report."
 msgstr ""
 
 #: templates/strings.js:26
-msgid "There was a problem with your email/password combination. If you have forgotten your password, or do not have one, you can set one by returning to the email screen and selecting the set password option."
+msgid "There was a problem with your email/password combination. If you have forgotten your password, or do not have one, you can set one by returning to the email screen and selecting the set password option. Passwords are not activated until the link in the confirmation email is clicked."
 msgstr ""
 
 #: templates/reports.html:9
diff --git a/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po b/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
index c5cd37a..c909d4f 100644
--- a/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
+++ b/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: struan@mysociety.org\n"
-"POT-Creation-Date: 2013-09-12 10:13+0100\n"
+"POT-Creation-Date: 2013-09-12 10:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -383,7 +383,8 @@ msgstr ""
 
 #: templates/strings.js:25
 msgid ""
-"There was a problem logging you in. Please check your email and password"
+"There was a problem logging you in. Please check your email and password and "
+"that you have confirmed your password."
 msgstr ""
 
 #: templates/strings.js:23
@@ -418,7 +419,8 @@ msgstr ""
 msgid ""
 "There was a problem with your email/password combination. If you have "
 "forgotten your password, or do not have one, you can set one by returning to "
-"the email screen and selecting the set password option."
+"the email screen and selecting the set password option. Passwords are not "
+"activated until the link in the confirmation email is clicked."
 msgstr ""
 
 #: templates/reports.html:9
diff --git a/src/js/strings.js b/src/js/strings.js
index 545795c..a421279 100644
--- a/src/js/strings.js
+++ b/src/js/strings.js
@@ -22,8 +22,8 @@
         strings: {
             login_error: 'There was a problem logging you in. Please try again later.',
             logout_error: 'There was a problem logging you out. Please try again later.',
-            login_details_error: 'There was a problem logging you in. Please check your email and password',
-            password_problem: 'There was a problem with your email/password combination. If you have forgotten your password, or do not have one, you can set one by returning to the email screen and selecting the set password option.',
+            login_details_error: 'There was a problem logging you in. Please check your email and password and that you have confirmed your password.',
+            password_problem: 'There was a problem with your email/password combination. If you have forgotten your password, or do not have one, you can set one by returning to the email screen and selecting the set password option. Passwords are not activated until the link in the confirmation email is clicked.',
             search_placeholder: 'Search for a place or postcode',
             location_error: 'Location error',
             location_problem: 'There was a problem looking up your location.',
diff --git a/templates/strings.js b/templates/strings.js
index aaf7270..661a01a 100644
--- a/templates/strings.js
+++ b/templates/strings.js
@@ -22,8 +22,8 @@
         strings: {
             login_error: '[% loc('There was a problem logging you in. Please try again later.') %]',
             logout_error: '[% loc('There was a problem logging you out. Please try again later.') %]',
-            login_details_error: '[% loc('There was a problem logging you in. Please check your email and password') %]',
-            password_problem: '[% loc('There was a problem with your email/password combination. If you have forgotten your password, or do not have one, you can set one by returning to the email screen and selecting the set password option.') %]',
+            login_details_error: '[% loc('There was a problem logging you in. Please check your email and password and that you have confirmed your password.') %]',
+            password_problem: '[% loc('There was a problem with your email/password combination. If you have forgotten your password, or do not have one, you can set one by returning to the email screen and selecting the set password option. Passwords are not activated until the link in the confirmation email is clicked.') %]',
             search_placeholder: '[% loc('Search for a place or postcode') %]',
             location_error: '[% loc('Location error') %]',
             location_problem: '[% loc('There was a problem looking up your location.') %]',