From 099e95c7e3d8b2ac6a47f2400202d3596e17bb81 Mon Sep 17 00:00:00 2001 From: graham-dds Date: Tue, 11 Feb 2020 14:13:10 -0500 Subject: [PATCH 1/2] =?UTF-8?q?SPACE=20FORCE=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- atst/forms/data.py | 1 + translations.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/atst/forms/data.py b/atst/forms/data.py index bb728686..1aba3829 100644 --- a/atst/forms/data.py +++ b/atst/forms/data.py @@ -10,6 +10,7 @@ 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")), ("other", translate("forms.portfolio.defense_component.choices.other")), ] diff --git a/translations.yaml b/translations.yaml index 6fe84865..24a10b92 100644 --- a/translations.yaml +++ b/translations.yaml @@ -296,6 +296,7 @@ forms: army: Army marine_corps: Marine Corps navy: Navy + space_force: Space Force other: Other title: Select DoD component(s) funding your Portfolio validation_message: You must select at least one defense component. From f8433fb7ef5b1a898a9413505ae59b8a524ff18d Mon Sep 17 00:00:00 2001 From: graham-dds Date: Tue, 11 Feb 2020 15:10:00 -0500 Subject: [PATCH 2/2] Add branches that are not space force --- atst/forms/data.py | 3 +++ translations.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/atst/forms/data.py b/atst/forms/data.py index 1aba3829..ea2c1c8a 100644 --- a/atst/forms/data.py +++ b/atst/forms/data.py @@ -11,6 +11,9 @@ SERVICE_BRANCHES = [ ), ("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")), ] diff --git a/translations.yaml b/translations.yaml index 24a10b92..a147dc13 100644 --- a/translations.yaml +++ b/translations.yaml @@ -297,6 +297,9 @@ forms: 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.