From bb3ceb4dea34eb55328e63897cc6223ff4a47630 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Wed, 2 Oct 2024 19:11:12 -0400
Subject: [PATCH 1/4] updated error messages

---
 src/registrar/forms/domain.py                           | 8 ++++----
 src/registrar/forms/domain_request_wizard.py            | 6 +++---
 src/registrar/forms/portfolio.py                        | 3 ++-
 src/registrar/forms/user_profile.py                     | 2 +-
 src/registrar/templates/domain_org_name_address.html    | 2 +-
 src/registrar/templates/domain_request_org_contact.html | 2 +-
 src/registrar/templates/portfolio_organization.html     | 2 +-
 src/registrar/tests/test_forms.py                       | 2 +-
 src/registrar/utility/errors.py                         | 2 +-
 9 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 84fcbe973..3d79790ca 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -35,7 +35,7 @@ class DomainAddUserForm(forms.Form):
     email = forms.EmailField(
         label="Email",
         max_length=None,
-        error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
+        error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
         validators=[
             MaxLengthValidator(
                 320,
@@ -285,7 +285,7 @@ class UserForm(forms.ModelForm):
             "required": "Enter your title or role in your organization (e.g., Chief Information Officer)"
         }
         self.fields["email"].error_messages = {
-            "required": "Enter your email address in the required format, like name@example.com."
+            "required": "Enter an email address in the required format, like name@example.com."
         }
         self.fields["phone"].error_messages["required"] = "Enter your phone number."
         self.domainInfo = None
@@ -342,7 +342,7 @@ class ContactForm(forms.ModelForm):
             "required": "Enter your title or role in your organization (e.g., Chief Information Officer)"
         }
         self.fields["email"].error_messages = {
-            "required": "Enter your email address in the required format, like name@example.com."
+            "required": "Enter an email address in the required format, like name@example.com."
         }
         self.fields["phone"].error_messages["required"] = "Enter your phone number."
         self.domainInfo = None
@@ -458,7 +458,7 @@ class DomainOrgNameAddressForm(forms.ModelForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a zip code in the required format, like 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
             )
         ],
     )
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index f2fdd32bc..4fb2f9265 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -137,10 +137,10 @@ class OrganizationContactForm(RegistrarForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a zip code in the form of 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
             )
         ],
-        error_messages={"required": ("Enter a zip code in the form of 12345 or 12345-6789.")},
+        error_messages={"required": ("Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.")},
     )
     urbanization = forms.CharField(
         required=False,
@@ -603,7 +603,7 @@ class CisaRepresentativeForm(BaseDeletableRegistrarForm):
         max_length=None,
         required=False,
         error_messages={
-            "invalid": ("Enter your representative’s email address in the required format, like name@example.com."),
+            "invalid": ("Enter an email address in the required format, like name@example.com."),
         },
         validators=[
             MaxLengthValidator(
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 14a45f6ae..85bc51240 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -17,7 +17,7 @@ class PortfolioOrgAddressForm(forms.ModelForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a zip code in the required format, like 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
             )
         ],
     )
@@ -38,6 +38,7 @@ class PortfolioOrgAddressForm(forms.ModelForm):
             "state_territory": {
                 "required": "Select the state, territory, or military post where your organization is located."
             },
+            "zipcode": {"required": "Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789."},
         }
         widgets = {
             # We need to set the required attributed for State/territory
diff --git a/src/registrar/forms/user_profile.py b/src/registrar/forms/user_profile.py
index 2a6ed4a47..8d8e2973d 100644
--- a/src/registrar/forms/user_profile.py
+++ b/src/registrar/forms/user_profile.py
@@ -58,7 +58,7 @@ class UserProfileForm(forms.ModelForm):
             "required": "Enter your title or role in your organization (e.g., Chief Information Officer)"
         }
         self.fields["email"].error_messages = {
-            "required": "Enter your email address in the required format, like name@example.com."
+            "required": "Enter an email address in the required format, like name@example.com."
         }
         self.fields["phone"].error_messages["required"] = "Enter your phone number."
 
diff --git a/src/registrar/templates/domain_org_name_address.html b/src/registrar/templates/domain_org_name_address.html
index 78baed09e..f7f6b558b 100644
--- a/src/registrar/templates/domain_org_name_address.html
+++ b/src/registrar/templates/domain_org_name_address.html
@@ -42,7 +42,7 @@
 
     {% input_with_errors form.state_territory %}
 
-    {% with add_class="usa-input--small" sublabel_text="Enter a zip code in the required format, like 12345 or 12345-6789." %}
+    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
       {% input_with_errors form.zipcode %}
     {% endwith %}
 
diff --git a/src/registrar/templates/domain_request_org_contact.html b/src/registrar/templates/domain_request_org_contact.html
index d4f3c2071..72c6e4b6d 100644
--- a/src/registrar/templates/domain_request_org_contact.html
+++ b/src/registrar/templates/domain_request_org_contact.html
@@ -33,7 +33,7 @@
 
     {% input_with_errors forms.0.state_territory %}
 
-    {% with add_class="usa-input--small" sublabel_text="Enter a zip code in the required format, like 12345 or 12345-6789." %}
+    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
       {% input_with_errors forms.0.zipcode %}
     {% endwith %}
 
diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index 2e6a1f488..1c59ae726 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -45,7 +45,7 @@
                 {% input_with_errors form.address_line2 %}
                 {% input_with_errors form.city %}
                 {% input_with_errors form.state_territory %}
-                {% with add_class="usa-input--small" sublabel_text="Enter a zip code in the required format, like 12345 or 12345-6789." %}
+                {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
                     {% input_with_errors form.zipcode %}
                 {% endwith %}
                 <button type="submit" class="usa-button">
diff --git a/src/registrar/tests/test_forms.py b/src/registrar/tests/test_forms.py
index eb4cad040..8ca5b4192 100644
--- a/src/registrar/tests/test_forms.py
+++ b/src/registrar/tests/test_forms.py
@@ -33,7 +33,7 @@ class TestFormValidation(MockEppLib):
         form = OrganizationContactForm(data={"zipcode": "nah"})
         self.assertEqual(
             form.errors["zipcode"],
-            ["Enter a zip code in the form of 12345 or 12345-6789."],
+            ["Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789."],
         )
 
     def test_org_contact_zip_valid(self):
diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py
index 8cb83c0ee..cfa6a537b 100644
--- a/src/registrar/utility/errors.py
+++ b/src/registrar/utility/errors.py
@@ -240,7 +240,7 @@ class SecurityEmailError(Exception):
     """
 
     _error_mapping = {
-        SecurityEmailErrorCodes.BAD_DATA: ("Enter an email address in the required format, " "like name@example.com."),
+        SecurityEmailErrorCodes.BAD_DATA: ("Enter an email address in the required format, like name@example.com."),
     }
 
     def __init__(self, *args, code=None, **kwargs):

From 360d0d434005b2d045f7babfcf181e5e69fc1029 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 3 Oct 2024 12:21:05 -0400
Subject: [PATCH 2/4] lowercased ZIP

---
 src/registrar/forms/domain.py                           | 2 +-
 src/registrar/forms/domain_request_wizard.py            | 4 ++--
 src/registrar/forms/portfolio.py                        | 4 ++--
 src/registrar/templates/domain_org_name_address.html    | 2 +-
 src/registrar/templates/domain_request_org_contact.html | 2 +-
 src/registrar/templates/portfolio_organization.html     | 2 +-
 src/registrar/tests/test_forms.py                       | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 3d79790ca..c4e9fdcb7 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -458,7 +458,7 @@ class DomainOrgNameAddressForm(forms.ModelForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
             )
         ],
     )
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index 4fb2f9265..3dc9c157c 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -137,10 +137,10 @@ class OrganizationContactForm(RegistrarForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
             )
         ],
-        error_messages={"required": ("Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.")},
+        error_messages={"required": ("Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.")},
     )
     urbanization = forms.CharField(
         required=False,
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 85bc51240..642b6b46e 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -17,7 +17,7 @@ class PortfolioOrgAddressForm(forms.ModelForm):
         validators=[
             RegexValidator(
                 "^[0-9]{5}(?:-[0-9]{4})?$|^$",
-                message="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789.",
+                message="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
             )
         ],
     )
@@ -38,7 +38,7 @@ class PortfolioOrgAddressForm(forms.ModelForm):
             "state_territory": {
                 "required": "Select the state, territory, or military post where your organization is located."
             },
-            "zipcode": {"required": "Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789."},
+            "zipcode": {"required": "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789."},
         }
         widgets = {
             # We need to set the required attributed for State/territory
diff --git a/src/registrar/templates/domain_org_name_address.html b/src/registrar/templates/domain_org_name_address.html
index f7f6b558b..0785b6da1 100644
--- a/src/registrar/templates/domain_org_name_address.html
+++ b/src/registrar/templates/domain_org_name_address.html
@@ -42,7 +42,7 @@
 
     {% input_with_errors form.state_territory %}
 
-    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
+    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789." %}
       {% input_with_errors form.zipcode %}
     {% endwith %}
 
diff --git a/src/registrar/templates/domain_request_org_contact.html b/src/registrar/templates/domain_request_org_contact.html
index 72c6e4b6d..44b404bbf 100644
--- a/src/registrar/templates/domain_request_org_contact.html
+++ b/src/registrar/templates/domain_request_org_contact.html
@@ -33,7 +33,7 @@
 
     {% input_with_errors forms.0.state_territory %}
 
-    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
+    {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789." %}
       {% input_with_errors forms.0.zipcode %}
     {% endwith %}
 
diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index 1c59ae726..712d1a6ca 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -45,7 +45,7 @@
                 {% input_with_errors form.address_line2 %}
                 {% input_with_errors form.city %}
                 {% input_with_errors form.state_territory %}
-                {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789." %}
+                {% with add_class="usa-input--small" sublabel_text="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789." %}
                     {% input_with_errors form.zipcode %}
                 {% endwith %}
                 <button type="submit" class="usa-button">
diff --git a/src/registrar/tests/test_forms.py b/src/registrar/tests/test_forms.py
index 8ca5b4192..12d9af8ac 100644
--- a/src/registrar/tests/test_forms.py
+++ b/src/registrar/tests/test_forms.py
@@ -33,7 +33,7 @@ class TestFormValidation(MockEppLib):
         form = OrganizationContactForm(data={"zipcode": "nah"})
         self.assertEqual(
             form.errors["zipcode"],
-            ["Enter a 5-digit or 9-digit ZIP code, like 12345 or 12345-6789."],
+            ["Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789."],
         )
 
     def test_org_contact_zip_valid(self):

From 616bdf2584840df873677f51ef98fbdd5368b59a Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 10 Oct 2024 06:05:53 -0400
Subject: [PATCH 3/4] fixed some additional instances of incorrect error
 message

---
 src/registrar/forms/domain.py                | 8 +++++++-
 src/registrar/forms/domain_request_wizard.py | 6 +++++-
 src/registrar/forms/portfolio.py             | 3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index c4e9fdcb7..e2dd6abb8 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -35,7 +35,10 @@ class DomainAddUserForm(forms.Form):
     email = forms.EmailField(
         label="Email",
         max_length=None,
-        error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
+        error_messages={
+            "invalid": ("Enter an email address in the required format, like name@example.com."),
+            "required": ("Enter an email address in the required format, like name@example.com.")
+        },
         validators=[
             MaxLengthValidator(
                 320,
@@ -461,6 +464,9 @@ class DomainOrgNameAddressForm(forms.ModelForm):
                 message="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
             )
         ],
+        error_messages={
+            'required': "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
+        }
     )
 
     class Meta:
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index 3dc9c157c..343453084 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -226,7 +226,10 @@ class SeniorOfficialForm(RegistrarForm):
     email = forms.EmailField(
         label="Email",
         max_length=None,
-        error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
+        error_messages={
+            "invalid": ("Enter an email address in the required format, like name@example.com."),
+            "required": ("Enter an email address in the required format, like name@example.com.")
+        },
         validators=[
             MaxLengthValidator(
                 320,
@@ -604,6 +607,7 @@ class CisaRepresentativeForm(BaseDeletableRegistrarForm):
         required=False,
         error_messages={
             "invalid": ("Enter an email address in the required format, like name@example.com."),
+            "required": ("Enter an email address in the required format, like name@example.com.")
         },
         validators=[
             MaxLengthValidator(
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 642b6b46e..d8f052b71 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -20,6 +20,9 @@ class PortfolioOrgAddressForm(forms.ModelForm):
                 message="Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
             )
         ],
+        error_messages={
+            'required': "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
+        }
     )
 
     class Meta:

From da96454365d379b831716a231bbefa2959e226f9 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 10 Oct 2024 06:12:30 -0400
Subject: [PATCH 4/4] formatted code for readability

---
 src/registrar/forms/domain.py                | 6 +++---
 src/registrar/forms/domain_request_wizard.py | 4 ++--
 src/registrar/forms/portfolio.py             | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index e2dd6abb8..5a239af2f 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -37,7 +37,7 @@ class DomainAddUserForm(forms.Form):
         max_length=None,
         error_messages={
             "invalid": ("Enter an email address in the required format, like name@example.com."),
-            "required": ("Enter an email address in the required format, like name@example.com.")
+            "required": ("Enter an email address in the required format, like name@example.com."),
         },
         validators=[
             MaxLengthValidator(
@@ -465,8 +465,8 @@ class DomainOrgNameAddressForm(forms.ModelForm):
             )
         ],
         error_messages={
-            'required': "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
-        }
+            "required": "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
+        },
     )
 
     class Meta:
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index 343453084..b99ae3344 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -228,7 +228,7 @@ class SeniorOfficialForm(RegistrarForm):
         max_length=None,
         error_messages={
             "invalid": ("Enter an email address in the required format, like name@example.com."),
-            "required": ("Enter an email address in the required format, like name@example.com.")
+            "required": ("Enter an email address in the required format, like name@example.com."),
         },
         validators=[
             MaxLengthValidator(
@@ -607,7 +607,7 @@ class CisaRepresentativeForm(BaseDeletableRegistrarForm):
         required=False,
         error_messages={
             "invalid": ("Enter an email address in the required format, like name@example.com."),
-            "required": ("Enter an email address in the required format, like name@example.com.")
+            "required": ("Enter an email address in the required format, like name@example.com."),
         },
         validators=[
             MaxLengthValidator(
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index d8f052b71..999d76d51 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -21,8 +21,8 @@ class PortfolioOrgAddressForm(forms.ModelForm):
             )
         ],
         error_messages={
-            'required': "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
-        }
+            "required": "Enter a 5-digit or 9-digit zip code, like 12345 or 12345-6789.",
+        },
     )
 
     class Meta: