From 335cc160fac44a7baf16875ebee076188d1ea922 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Tue, 2 Feb 2016 15:41:54 +0000
Subject: [PATCH] Fix wording

---
 app/main/forms.py                   |  4 ++--
 app/templates/views/verify.html     | 10 +++++-----
 tests/app/main/views/test_verify.py |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index aec0fe2d2..188b5b8df 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -62,7 +62,7 @@ def password(label='Create a password'):
 
 def sms_code():
     verify_code = '^\d{5}$'
-    return StringField('Text message confirmation code',
+    return StringField('Text message code',
                        validators=[DataRequired(message='Text message confirmation code can not be empty'),
                                    Regexp(regex=verify_code,
                                           message='Text message confirmation code must be 5 digits')])
@@ -70,7 +70,7 @@ def sms_code():
 
 def email_code():
     verify_code = '^\d{5}$'
-    return StringField("Email confirmation code",
+    return StringField("Email code",
                        validators=[DataRequired(message='Email confirmation code can not be empty'),
                                    Regexp(regex=verify_code, message='Email confirmation code must be 5 digits')])
 
diff --git a/app/templates/views/verify.html b/app/templates/views/verify.html
index 7d6819779..292c777f5 100644
--- a/app/templates/views/verify.html
+++ b/app/templates/views/verify.html
@@ -10,10 +10,10 @@ GOV.UK Notify | Confirm email address and mobile number
 
 <div class="grid-row">
   <div class="column-two-thirds">
-    <h1 class="heading-large">Activate your account</h1>
-
-    <p>We’ve sent you confirmation codes by email and text message. You need to enter both codes here.</p>
-
+    <h1 class="heading-large">Enter the codes we’ve sent you</h1>
+    <p>
+      We’ve sent you confirmation codes by email and text message.
+    </p>
     <form autocomplete="off" method="post">
       {{ textbox(
         form.email_code,
@@ -25,7 +25,7 @@ GOV.UK Notify | Confirm email address and mobile number
         form.sms_code,
         width='5em',
         help_link=url_for('.check_and_resend_text_code'),
-        help_link_text='I haven’t received a text'
+        help_link_text='I haven’t received a text message'
       ) }}
       {{ page_footer("Continue") }}
     </form>
diff --git a/tests/app/main/views/test_verify.py b/tests/app/main/views/test_verify.py
index 48240e307..4b5d790da 100644
--- a/tests/app/main/views/test_verify.py
+++ b/tests/app/main/views/test_verify.py
@@ -18,7 +18,7 @@ def test_should_return_verify_template(app_,
             assert response.status_code == 200
             assert (
                 "We’ve sent you confirmation codes by email and text message."
-                " You need to enter both codes here.") in response.get_data(as_text=True)
+            ) in response.get_data(as_text=True)
 
 
 def test_should_redirect_to_add_service_when_code_are_correct(app_,