Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Older Adult selection label copy #1513

Merged
merged 7 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions benefits/core/migrations/0002_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
thekaveman marked this conversation as resolved.
Show resolved Hide resolved
start_template="eligibility/start__login_gov.html",
unverified_title=_("eligibility.pages.unverified.title"),
unverified_blurb=_("eligibility.pages.unverified.p[0]"),
Expand All @@ -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",
thekaveman marked this conversation as resolved.
Show resolved Hide resolved
start_template="eligibility/start__veteran.html",
unverified_title=_("eligibility.pages.unverified.title"),
unverified_blurb=_("eligibility.pages.unverified.p[0]"),
Expand All @@ -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"),
Expand All @@ -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]"),
Expand Down
Original file line number Diff line number Diff line change
@@ -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 %}
Original file line number Diff line number Diff line change
@@ -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 %}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "core/includes/verifier_radio_select_label.html" %}
{% extends "core/includes/selection-label.html" %}
{% load i18n %}

{% block label %}
Expand Down

This file was deleted.

This file was deleted.

22 changes: 10 additions & 12 deletions benefits/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
"POT-Creation-Date: 2023-07-10 21:14+0000\n"
"POT-Creation-Date: 2023-07-10 22:55+0000\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -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."

thekaveman marked this conversation as resolved.
Show resolved Hide resolved
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"

Expand Down
21 changes: 9 additions & 12 deletions benefits/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
"POT-Creation-Date: 2023-07-10 21:14+0000\n"
"POT-Creation-Date: 2023-07-10 22:55+0000\n"
"Language: Español\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -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 "
thekaveman marked this conversation as resolved.
Show resolved Hide resolved
"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"

Expand Down
2 changes: 1 addition & 1 deletion tests/pytest/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down