Merge branch 'dev' into feat/1481-veterans--littlepay-modal

cal-itp · Jul 12, 2023 · 8fff84e · 8fff84e
2 parents 0eb8011 + de0484d
commit 8fff84e
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 48 deletions.
diff --git a/benefits/core/migrations/0002_data.py b/benefits/core/migrations/0002_data.py
@@ -151,7 +151,7 @@ def load_data(app, *args, **kwargs):
         name=os.environ.get("MST_OAUTH_VERIFIER_NAME", "OAuth claims via Login.gov (MST)"),
         eligibility_type=mst_senior_type,
         auth_provider=senior_auth_provider,
-        selection_label_template="core/includes/selection_label__login_gov.html",
+        selection_label_template="core/includes/selection-label--senior.html",
         start_template="eligibility/start__login_gov.html",
         unverified_title=_("eligibility.pages.unverified.title"),
         unverified_blurb=_("eligibility.pages.unverified.p[0]"),
@@ -164,7 +164,7 @@ def load_data(app, *args, **kwargs):
         name=os.environ.get("MST_VETERAN_VERIFIER_NAME", "VA.gov - Veteran (MST)"),
         eligibility_type=mst_veteran_type,
         auth_provider=veteran_auth_provider,
-        selection_label_template="core/includes/selection_label__mst_veteran.html",
+        selection_label_template="core/includes/selection-label--veteran.html",
         start_template="eligibility/start__veteran.html",
         unverified_title=_("eligibility.pages.unverified.title"),
         unverified_blurb=_("eligibility.pages.unverified.p[0]"),
@@ -184,7 +184,7 @@ def load_data(app, *args, **kwargs):
         jwe_encryption_alg=os.environ.get("COURTESY_CARD_VERIFIER_JWE_ENCRYPTION_ALG", "RSA-OAEP"),
         jws_signing_alg=os.environ.get("COURTESY_CARD_VERIFIER_JWS_SIGNING_ALG", "RS256"),
         auth_provider=None,
-        selection_label_template="core/includes/selection_label__mst_courtesy_card.html",
+        selection_label_template="core/includes/selection-label--mst-courtesy-card.html",
         start_template="eligibility/start__mst_courtesy_card.html",
         form_title=_("eligibility.pages.confirm.mst_cc.title"),
         form_headline=_("eligibility.pages.confirm.mst_cc.headline"),
@@ -210,7 +210,7 @@ def load_data(app, *args, **kwargs):
         name=os.environ.get("SACRT_OAUTH_VERIFIER_NAME", "OAuth claims via Login.gov (SacRT)"),
         eligibility_type=sacrt_senior_type,
         auth_provider=senior_auth_provider,
-        selection_label_template="core/includes/selection_label__login_gov.html",
+        selection_label_template="core/includes/selection-label--senior.html",
         start_template="eligibility/start__login_gov.html",
         unverified_title=_("eligibility.pages.unverified.title"),
         unverified_blurb=_("eligibility.pages.unverified.p[0]"),

diff --git a/benefits/core/templates/core/includes/selection-label--mst-courtesy-card.html b/benefits/core/templates/core/includes/selection-label--mst-courtesy-card.html
@@ -0,0 +1,10 @@
+{% extends "core/includes/selection-label.html" %}
+{% load i18n %}
+
+{% block label %}
+    {% translate "eligibility.pages.index.mst_courtesy_card.label" %}
+{% endblock label %}
+
+{% block description %}
+    {% translate "eligibility.pages.index.mst_courtesy_card.description" %}
+{% endblock description %}
diff --git a/benefits/core/templates/core/includes/selection-label--senior.html b/benefits/core/templates/core/includes/selection-label--senior.html
@@ -0,0 +1,10 @@
+{% extends "core/includes/selection-label.html" %}
+{% load i18n %}
+
+{% block label %}
+    {% translate "eligibility.pages.index.senior.label" %}
+{% endblock label %}
+
+{% block description %}
+    {% translate "eligibility.pages.index.senior.description" %}
+{% endblock description %}
diff --git a/...ncludes/selection_label__mst_veteran.html → ...re/includes/selection-label--veteran.html b/...ncludes/selection_label__mst_veteran.html → ...re/includes/selection-label--veteran.html
@@ -1,4 +1,4 @@
-{% extends "core/includes/verifier_radio_select_label.html" %}
+{% extends "core/includes/selection-label.html" %}
 {% load i18n %}
 
 {% block label %}

diff --git a/...includes/verifier_radio_select_label.html → ...plates/core/includes/selection-label.html b/...includes/verifier_radio_select_label.html → ...plates/core/includes/selection-label.html
diff --git a/benefits/core/templates/core/includes/selection_label__login_gov.html b/benefits/core/templates/core/includes/selection_label__login_gov.html
diff --git a/benefits/core/templates/core/includes/selection_label__mst_courtesy_card.html b/benefits/core/templates/core/includes/selection_label__mst_courtesy_card.html
diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
@@ -303,24 +303,22 @@ msgstr ""
 "To function properly, this website requires a browser that supports "
 "JavaScript. Please enable JavaScript for this website and"
 
-msgid "eligibility.pages.index.login_gov.label"
-msgstr "I am 65 years of age or older"
-
-msgid "eligibility.pages.index.login_gov.description"
-msgstr ""
-"You must be 65 years or older. This benefit does not expire, but you may "
-"need to renew. Using this benefit means your new transit fare is half of the "
-"standard fare."
-
-msgid "eligibility.pages.index.mst_cc.label"
+msgid "eligibility.pages.index.mst_courtesy_card.label"
 msgstr "I have an MST Courtesy Card"
 
-msgid "eligibility.pages.index.mst_cc.description"
+msgid "eligibility.pages.index.mst_courtesy_card.description"
 msgstr ""
 "This option is for people who have a current Courtesy Card or an MST RIDES "
 "Eligibility card. This benefit may need to be renewed in the future. Using "
 "this benefit means your new transit fare is half of the standard fare."
 
+msgid "eligibility.pages.index.senior.label"
+msgstr "Older Adult"
+
+msgid "eligibility.pages.index.senior.description"
+msgstr ""
+"You must be 65 years or older. You will need to verify your identity with"
+
 msgid "eligibility.pages.index.veteran.label"
 msgstr "US Veteran"
 

diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
@@ -314,25 +314,22 @@ msgstr ""
 "Para funcionar correctamente, este sitio web requiere un navegador que "
 "admita JavaScript. Por favor, active JavaScript por este sitio web y"
 
-msgid "eligibility.pages.index.login_gov.label"
-msgstr "Tengo 65 años de edad o más"
-
-msgid "eligibility.pages.index.login_gov.description"
-msgstr ""
-"Usted debe de tener 65 años o más. Este beneficio no caduca, pero es posible "
-"que deba renovarlo. Usando este beneficio significa que su nueva tarifa de "
-"tránsito es la mitad de la tarifa estándar."
-
-msgid "eligibility.pages.index.mst_cc.label"
+msgid "eligibility.pages.index.mst_courtesy_card.label"
 msgstr "Tengo una Tarjeta de Cortesía de MST"
 
-msgid "eligibility.pages.index.mst_cc.description"
+msgid "eligibility.pages.index.mst_courtesy_card.description"
 msgstr ""
 "Esta opción es para personas que tienen una Tarjeta de Cortesía actual o una "
 "tarjeta de elegibilidad de Paratránsito de MST RIDES. Es posible que este "
 "beneficio deba renovarse en el futuro. Usar este beneficio significa que su "
 "nueva tarifa de tránsito es la mitad de la tarifa estándar."
 
+msgid "eligibility.pages.index.senior.label"
+msgstr "Adulto mayor"
+
+msgid "eligibility.pages.index.senior.description"
+msgstr "Debe tener 65 años o más. Deberá verificar su identidad con"
+
 msgid "eligibility.pages.index.veteran.label"
 msgstr "TODO: US Veteran"
 

diff --git a/tests/pytest/conftest.py b/tests/pytest/conftest.py
@@ -107,7 +107,7 @@ def model_EligibilityVerifier(model_PemData, model_EligibilityType):
         api_auth_key="secret-key",
         eligibility_type=model_EligibilityType,
         public_key=model_PemData,
-        selection_label_template="core/includes/verifier_radio_select_label.html",
+        selection_label_template="core/includes/selection-label.html",
         form_title="Form",
         form_headline="Form",
         form_blurb="Form Blurb",