Merge branch 'staging' into state-machine-complete-trigger

This commit is contained in:
tomdds 2020-02-12 10:37:31 -05:00 committed by GitHub
commit 6f700cc07e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions

View File

@ -10,6 +10,10 @@ SERVICE_BRANCHES = [
translate("forms.portfolio.defense_component.choices.marine_corps"),
),
("navy", translate("forms.portfolio.defense_component.choices.navy")),
("space_force", translate("forms.portfolio.defense_component.choices.space_force")),
("ccmd_js", translate("forms.portfolio.defense_component.choices.ccmd_js")),
("dafa", translate("forms.portfolio.defense_component.choices.dafa")),
("osd_psas", translate("forms.portfolio.defense_component.choices.osd_psas")),
("other", translate("forms.portfolio.defense_component.choices.other")),
]

View File

@ -296,6 +296,10 @@ forms:
army: Army
marine_corps: Marine Corps
navy: Navy
space_force: Space Force
ccmd_js: Combatant Command / Joint Staff (CCMD/JS)
dafa: Defense Agency and Field Activity (DAFA)
osd_psas: Office of the Secretary of Defense (OSD) / Principal Staff Assistants (PSAs)
other: Other
title: Select DoD component(s) funding your Portfolio
validation_message: You must select at least one defense component.