darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix wording

Browse Source
This commit is contained in:
Chris Hill-Scott
2016-02-02 15:41:54 +00:00
parent 9c856af789
commit 335cc160fa
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/forms.py
View File

@@ -62,7 +62,7 @@ def password(label='Create a password'):
def sms_code(): def sms_code():
verify_code = '^\d{5}$' 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'), validators=[DataRequired(message='Text message confirmation code can not be empty'),
Regexp(regex=verify_code, Regexp(regex=verify_code,
message='Text message confirmation code must be 5 digits')]) message='Text message confirmation code must be 5 digits')])
@@ -70,7 +70,7 @@ def sms_code():
def email_code(): def email_code():
verify_code = '^\d{5}$' verify_code = '^\d{5}$'
return StringField("Email confirmation code", return StringField("Email code",
validators=[DataRequired(message='Email confirmation code can not be empty'), validators=[DataRequired(message='Email confirmation code can not be empty'),
Regexp(regex=verify_code, message='Email confirmation code must be 5 digits')]) Regexp(regex=verify_code, message='Email confirmation code must be 5 digits')])

10
app/templates/views/verify.html
View File

@@ -10,10 +10,10 @@ GOV.UK Notify | Confirm email address and mobile number
<div class="grid-row"> <div class="grid-row">
<div class="column-two-thirds"> <div class="column-two-thirds">
<h1 class="heading-large">Activate your account</h1> <h1 class="heading-large">Enter the codes we’ve sent you</h1>
<p>
<p>We’ve sent you confirmation codes by email and text message. You need to enter both codes here.</p> We’ve sent you confirmation codes by email and text message.
</p>
<form autocomplete="off" method="post"> <form autocomplete="off" method="post">
{{ textbox( {{ textbox(
form.email_code, form.email_code,
@@ -25,7 +25,7 @@ GOV.UK Notify | Confirm email address and mobile number
form.sms_code, form.sms_code,
width='5em', width='5em',
help_link=url_for('.check_and_resend_text_code'), 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") }} {{ page_footer("Continue") }}
</form> </form>

2
tests/app/main/views/test_verify.py
View File

@@ -18,7 +18,7 @@ def test_should_return_verify_template(app_,
assert response.status_code == 200 assert response.status_code == 200
assert ( assert (
"We’ve sent you confirmation codes by email and text message." "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_, def test_should_redirect_to_add_service_when_code_are_correct(app_,