diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py index b8cc92a5d..43a59dfb0 100644 --- a/src/registrar/forms/application_wizard.py +++ b/src/registrar/forms/application_wizard.py @@ -226,8 +226,10 @@ class OrganizationElectionForm(RegistrarForm): is_election_board = self.cleaned_data["is_election_board"] if is_election_board is None: raise forms.ValidationError( - "Select “Yes” if you represent an election office. Select “No” if you" - " don’t.", + ( + "Select “Yes” if you represent an election office. Select “No” if" + " you don’t." + ), code="required", ) return is_election_board @@ -399,6 +401,12 @@ class CurrentSitesForm(RegistrarForm): website = forms.URLField( required=False, label="Public website", + error_messages={ + "invalid": ( + "Enter your organization's website in the required format, like" + " www.city.com." + ) + }, ) @@ -676,7 +684,7 @@ class NoOtherContactsForm(RegistrarForm): # label has to end in a space to get the label_suffix to show label=( "Please explain why there are no other employees from your organization" - " that we can contact." + " we can contact to help us assess your eligibility for a .gov domain." ), widget=forms.Textarea(), ) @@ -692,7 +700,7 @@ class AnythingElseForm(RegistrarForm): class RequirementsForm(RegistrarForm): is_policy_acknowledged = forms.BooleanField( - label=("I read and agree to the requirements for operating .gov domains."), + label="I read and agree to the requirements for operating .gov domains.", error_messages={ "required": ( "Check the box if you read and agree to the requirements for" diff --git a/src/registrar/templates/application_done.html b/src/registrar/templates/application_done.html index 4c94880fc..4b270c0ee 100644 --- a/src/registrar/templates/application_done.html +++ b/src/registrar/templates/application_done.html @@ -1,7 +1,7 @@ {% extends 'base.html' %} {% load static %} -{% block title %}Thank you for your domain request{% endblock %} +{% block title %}Thanks for your domain request!{% endblock %} {% block content %}
@@ -14,7 +14,7 @@ />

Thank you

-

Thank you for your domain request. We'll email a copy of your request to you, +

We'll email a copy of your request to you, your authorizing official, and any contacts you added.

Next steps in this process

diff --git a/src/registrar/templates/application_your_contact.html b/src/registrar/templates/application_your_contact.html index ffbf10f8a..1016ebc71 100644 --- a/src/registrar/templates/application_your_contact.html +++ b/src/registrar/templates/application_your_contact.html @@ -2,8 +2,7 @@ {% load field_helpers %} {% block form_instructions %} -

We’ll use the following information to contact you about your domain request and, - once your request is approved, about managing your domain.

+

We’ll use this information to contact you about your domain request.

If you’d like us to use a different name, email, or phone number you can make those changes below. Changing your contact information here won’t affect your login.gov @@ -35,4 +34,4 @@ {% endwith %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/registrar/tests/test_forms.py b/src/registrar/tests/test_forms.py index a388bd9a3..7e3cfdf8a 100644 --- a/src/registrar/tests/test_forms.py +++ b/src/registrar/tests/test_forms.py @@ -29,7 +29,13 @@ class TestFormValidation(TestCase): def test_website_invalid(self): form = CurrentSitesForm(data={"website": "nah"}) - self.assertEqual(form.errors["website"], ["Enter a valid URL."]) + self.assertEqual( + form.errors["website"], + [ + "Enter your organization's" + " website in the required format, like www.city.com." + ], + ) def test_website_valid(self): form = CurrentSitesForm(data={"website": "hyphens-rule.gov.uk"}) @@ -83,7 +89,7 @@ class TestFormValidation(TestCase): """Must be a valid phone number.""" form = AuthorizingOfficialForm(data={"phone": "boss@boss"}) self.assertTrue( - form.errors["phone"][0].startswith("Enter a valid phone number") + form.errors["phone"][0].startswith("Enter a valid phone number ") ) def test_your_contact_email_invalid(self): @@ -98,7 +104,7 @@ class TestFormValidation(TestCase): """Must be a valid phone number.""" form = YourContactForm(data={"phone": "boss@boss"}) self.assertTrue( - form.errors["phone"][0].startswith("Enter a valid phone number") + form.errors["phone"][0].startswith("Enter a valid phone number ") ) def test_other_contact_email_invalid(self): @@ -113,7 +119,7 @@ class TestFormValidation(TestCase): """Must be a valid phone number.""" form = OtherContactsForm(data={"phone": "boss@boss"}) self.assertTrue( - form.errors["phone"][0].startswith("Enter a valid phone number") + form.errors["phone"][0].startswith("Enter a valid phone number ") ) def test_requirements_form_blank(self): diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py index 86a05a5ff..b1cc9c8d1 100644 --- a/src/registrar/tests/test_views.py +++ b/src/registrar/tests/test_views.py @@ -445,7 +445,7 @@ class DomainApplicationTests(TestWithUser, WebTest): self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) with less_console_noise(): final_result = review_result.follow() - self.assertContains(final_result, "Thank you for your domain request") + self.assertContains(final_result, "Thanks for your domain request!") # check that any new pages are added to this test self.assertEqual(num_pages, num_pages_tested)