diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py index 6a1077672..986085d69 100644 --- a/src/registrar/forms/domain.py +++ b/src/registrar/forms/domain.py @@ -93,12 +93,6 @@ class DomainOrgNameAddressForm(forms.ModelForm): "zipcode", "urbanization", ] - labels = { - "address_line1": "Street address", - "address_line2": "Street address line 2", - "state_territory": "State, territory, or military post", - "urbanization": "Urbanization (Puerto Rico only)", - } error_messages = { "federal_agency": { "required": "Select the federal agency for your organization." @@ -114,6 +108,10 @@ class DomainOrgNameAddressForm(forms.ModelForm): }, } widgets = { + # We need to set the required attributed for federal_agency and + # state/territory because for these fields we are creating an individual + # instance of the Select. For the other fields we use the for loop to set + # the class's required attribute to true. "federal_agency": forms.Select( attrs={"required": True}, choices=DomainInformation.AGENCY_CHOICES ), diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py index 78b68a3fa..b12039e73 100644 --- a/src/registrar/models/domain_information.py +++ b/src/registrar/models/domain_information.py @@ -100,11 +100,13 @@ class DomainInformation(TimeStampedModel): null=True, blank=True, help_text="Street address", + verbose_name="Street address", ) address_line2 = models.TextField( null=True, blank=True, help_text="Street address line 2", + verbose_name="Street address line 2", ) city = models.TextField( null=True, @@ -116,6 +118,7 @@ class DomainInformation(TimeStampedModel): null=True, blank=True, help_text="State, territory, or military post", + verbose_name="State, territory, or military post", ) zipcode = models.CharField( max_length=10, @@ -128,6 +131,7 @@ class DomainInformation(TimeStampedModel): null=True, blank=True, help_text="Urbanization (Puerto Rico only)", + verbose_name="Urbanization (Puerto Rico only)", ) type_of_work = models.TextField(