update org type text and other field labels

This commit is contained in:
Michelle Rago 2022-12-27 13:29:51 -05:00 committed by GitHub
parent 8b9bb67f51
commit 115cce62fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -93,21 +93,21 @@ class DomainApplication(TimeStampedModel):
ARMED_FORCES_AP = "AP", "Armed Forces Pacific (AP)" ARMED_FORCES_AP = "AP", "Armed Forces Pacific (AP)"
class OrganizationChoices(models.TextChoices): class OrganizationChoices(models.TextChoices):
FEDERAL = "federal", "Federal: a federal agency" FEDERAL = "federal", "Federal: an agency of the U.S. government's executive, legislative, or judicial branches"
INTERSTATE = "interstate", "Interstate: an organization of two or more states" INTERSTATE = "interstate", "Interstate: an organization of two or more states"
STATE_OR_TERRITORY = "state_or_territory", ( STATE_OR_TERRITORY = "state_or_territory", (
"State or Territory: One of the 50 U.S. states, the District of " "State or Territory: one of the 50 U.S. states, the District of "
"Columbia, American Samoa, Guam, Northern Mariana Islands, " "Columbia, American Samoa, Guam, Northern Mariana Islands, "
"Puerto Rico, or the U.S. Virgin Islands" "Puerto Rico, or the U.S. Virgin Islands"
) )
TRIBAL = "tribal", ( TRIBAL = "tribal", (
"Tribal: a tribal government recognized by the federal or " "Tribal: a tribal government recognized by the federal or "
"state government" "a state government"
) )
COUNTY = "county", "County: a county, parish, or borough" COUNTY = "county", "County: a county, parish, or borough"
CITY = "city", "City: a city, town, township, village, etc." CITY = "city", "City: a city, town, township, village, etc."
SPECIAL_DISTRICT = "special_district", ( SPECIAL_DISTRICT = "special_district", (
"Special District: an independent organization within a single state" "Special district: an independent organization within a single state"
) )
class BranchChoices(models.TextChoices): class BranchChoices(models.TextChoices):
@ -288,7 +288,7 @@ class DomainApplication(TimeStampedModel):
federal_agency = models.TextField( federal_agency = models.TextField(
null=True, null=True,
blank=True, blank=True,
help_text="Top level federal agency", help_text="Federal agency",
) )
federal_type = models.CharField( federal_type = models.CharField(
@ -296,7 +296,7 @@ class DomainApplication(TimeStampedModel):
choices=BranchChoices.choices, choices=BranchChoices.choices,
null=True, null=True,
blank=True, blank=True,
help_text="Branch of federal government", help_text="Federal government branch",
) )
is_election_board = models.BooleanField( is_election_board = models.BooleanField(
@ -314,13 +314,13 @@ class DomainApplication(TimeStampedModel):
address_line1 = models.TextField( address_line1 = models.TextField(
null=True, null=True,
blank=True, blank=True,
help_text="Address line 1", help_text="Street address",
) )
address_line2 = models.CharField( address_line2 = models.CharField(
max_length=15, max_length=15,
null=True, null=True,
blank=True, blank=True,
help_text="Address line 2", help_text="Street address line 2",
) )
city = models.TextField( city = models.TextField(
null=True, null=True,
@ -331,19 +331,19 @@ class DomainApplication(TimeStampedModel):
max_length=2, max_length=2,
null=True, null=True,
blank=True, blank=True,
help_text="State/Territory", help_text="State, territory, or military post",
) )
zipcode = models.CharField( zipcode = models.CharField(
max_length=10, max_length=10,
null=True, null=True,
blank=True, blank=True,
help_text="ZIP code", help_text="Zip code",
db_index=True, db_index=True,
) )
urbanization = models.TextField( urbanization = models.TextField(
null=True, null=True,
blank=True, blank=True,
help_text="Urbanization", help_text="Urbanization (Puerto Rico only)",
) )
authorizing_official = models.ForeignKey( authorizing_official = models.ForeignKey(
@ -388,7 +388,7 @@ class DomainApplication(TimeStampedModel):
purpose = models.TextField( purpose = models.TextField(
null=True, null=True,
blank=True, blank=True,
help_text="Purpose of the domain", help_text="Purpose of your domain",
) )
other_contacts = models.ManyToManyField( other_contacts = models.ManyToManyField(