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

Verifier Selection: Update copy, add link #951

Merged
merged 18 commits into from
Sep 28, 2022
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benefits/core/migrations/0002_sample_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def load_sample_data(app, *args, **kwargs):
jws_signing_alg="RS256",
auth_provider=auth_provider,
selection_label=_("eligibility.pages.index.sample.label"),
selection_label_description=None,
selection_label_description=_("eligibility.pages.index.sample.description"),
start_headline=_("eligibility.pages.start.sample.title"),
start_sub_headline=_("eligibility.pages.start.sample.content_title"),
start_item_name=_("eligibility.pages.start.sample.items[0].title"),
Expand Down
4 changes: 2 additions & 2 deletions benefits/eligibility/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ class EligibilityVerifierSelectionForm(forms.Form):
action_url = "eligibility:index"
method = "POST"

verifier = forms.ChoiceField(label="", widget=widgets.RadioSelect)
verifier = forms.ChoiceField(label=_("eligibility.pages.index.label"), widget=widgets.RadioSelect)

submit_value = _("eligibility.buttons.continue")
submit_value = _("eligibility.buttons.choose")

def __init__(self, agency: models.TransitAgency, *args, **kwargs):
super().__init__(*args, **kwargs)
Expand Down
6 changes: 6 additions & 0 deletions benefits/eligibility/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from django.template.response import TemplateResponse
from django.urls import reverse
from django.utils.decorators import decorator_from_middleware
from django.utils.html import format_html
from django.utils.translation import pgettext, gettext as _

from benefits.core import recaptcha, session, viewmodels
Expand Down Expand Up @@ -35,9 +36,14 @@ def index(request):

eligibility_start = reverse(ROUTE_START)

help_page = reverse(ROUTE_HELP)

page = viewmodels.Page(
title=_("eligibility.pages.index.title"),
content_title=_("eligibility.pages.index.content_title"),
paragraphs=[
format_html(_("eligibility.pages.index.p[0]%(info_link)s") % {"info_link": f"{help_page}#what-is-cal-itp"})
],
forms=forms.EligibilityVerifierSelectionForm(agency=agency),
)

Expand Down
73 changes: 52 additions & 21 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: 2022-09-28 02:50+0000\n"
"POT-Creation-Date: 2022-09-28 20:50+0000\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -23,7 +23,14 @@ msgstr "Sign out of Login.gov"

#: benefits/core/migrations/0002_sample_data.py:108
msgid "eligibility.pages.index.sample.label"
msgstr "Senior Discount Program"
msgstr "I am 65 years of age or older"

#: benefits/core/migrations/0002_sample_data.py:109
msgid "eligibility.pages.index.sample.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."

#: benefits/core/migrations/0002_sample_data.py:110
msgid "eligibility.pages.start.sample.title"
Expand Down Expand Up @@ -87,11 +94,15 @@ msgstr ""

#: benefits/core/migrations/0002_sample_data.py:140
msgid "eligibility.pages.index.mst_cc.label"
msgstr "MST Courtesy Cardholder"
msgstr "I have an MST Courtesy Card"

#: benefits/core/migrations/0002_sample_data.py:141
msgid "eligibility.pages.index.mst_cc.description"
msgstr "(includes MST RIDES Paratransit Eligibility cardholders)"
msgstr ""
"This option is for people who have a current Courtesy Card (includes MST "
"RIDES Eligibility cardholders). This benefit is part of a demonstration tool "
"and may need to be renewed in the future. Using this benefit means your new "
"transit fare is half of the standard fare.the sample."

#: benefits/core/migrations/0002_sample_data.py:142
msgid "eligibility.pages.start.mst_cc.headline"
Expand Down Expand Up @@ -518,9 +529,13 @@ msgstr "Connect your MST Benefit to your Contactless Card"
msgid "core.buttons.back"
msgstr "Go back"

#: benefits/eligibility/forms.py:23 benefits/eligibility/views.py:76
msgid "eligibility.buttons.continue"
msgstr "Continue"
#: benefits/eligibility/forms.py:21
msgid "eligibility.pages.index.label"
msgstr "Select the option that best applies to you:"

#: benefits/eligibility/forms.py:23
msgid "eligibility.buttons.choose"
msgstr "Choose this Benefit"

#: benefits/eligibility/forms.py:41
msgid "eligibility.forms.confirm.submit"
Expand All @@ -538,54 +553,70 @@ msgstr "Check your input. The format looks wrong."
msgid "eligibility.forms.confirm.errors.missing"
msgstr "This field is required."

#: benefits/eligibility/views.py:39
#: benefits/eligibility/views.py:42
msgid "eligibility.pages.index.title"
msgstr "Select a discount option"
msgstr "Select a benefit option"

#: benefits/eligibility/views.py:40
#: benefits/eligibility/views.py:43
msgid "eligibility.pages.index.content_title"
msgstr "Select the discount option that best applies to you:"
msgstr ""
"Connect your bank card to your public transit discount with Cal-ITP Benefits"

#: benefits/eligibility/views.py:45
#, python-format
msgid "eligibility.pages.index.p[0]%(info_link)s"
msgstr ""
"You can tap your credit or debit card when you board, and your discount will "
"automatically apply every time you ride. Cal-ITP doesn’t save any of your "
"information, and you don’t need to create an account. Verify for your "
"benefit, and connect your bank card today. <strong><a class='info-link' href="
"\"%(info_link)s\">Learn more about Cal-ITP Benefits</a></strong><span "
"class='period'>.</span>"

#: benefits/eligibility/views.py:82
msgid "eligibility.buttons.continue"
msgstr "Continue"

#: benefits/eligibility/views.py:80 benefits/enrollment/views.py:80
#: benefits/eligibility/views.py:86 benefits/enrollment/views.py:80
msgctxt "image alt text"
msgid "core.icons.idcardcheck"
msgstr "Identification card icon with checkmark"

#: benefits/eligibility/views.py:90
#: benefits/eligibility/views.py:96
msgid "eligibility.pages.start.mst_login.link_text"
msgstr "Learn more about Login.gov and providing proof of identity"

#: benefits/eligibility/views.py:95
#: benefits/eligibility/views.py:101
msgid "eligibility.pages.start.mst_login.required_items[0]"
msgstr "Your state-issued ID card"

#: benefits/eligibility/views.py:96
#: benefits/eligibility/views.py:102
msgid "eligibility.pages.start.mst_login.required_items[1]"
msgstr "Your Social Security number"

#: benefits/eligibility/views.py:97
#: benefits/eligibility/views.py:103
msgid "eligibility.pages.start.mst_login.required_items[2]"
msgstr "A phone number with a phone plan associated with your name"

#: benefits/eligibility/views.py:108 benefits/enrollment/views.py:150
#: benefits/eligibility/views.py:114 benefits/enrollment/views.py:150
msgctxt "image alt text"
msgid "core.icons.bankcardcheck"
msgstr "Bank card icon with contactless symbol and checkmark"

#: benefits/eligibility/views.py:109
#: benefits/eligibility/views.py:115
msgid "eligibility.pages.start.bankcard.title"
msgstr "Your bank card details"

#: benefits/eligibility/views.py:110
#: benefits/eligibility/views.py:116
msgid "eligibility.pages.start.bankcard.text"
msgstr ""
"Your card must be a contactless debit or credit card by Visa or Mastercard."

#: benefits/eligibility/views.py:116
#: benefits/eligibility/views.py:122
msgid "eligibility.pages.start.title"
msgstr "Get Started"

#: benefits/eligibility/views.py:227
#: benefits/eligibility/views.py:234
msgctxt "image alt text"
msgid "core.icons.idcardquestion"
msgstr "Identification card icon with question mark"
Expand Down
74 changes: 53 additions & 21 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: 2022-09-28 02:50+0000\n"
"POT-Creation-Date: 2022-09-28 20:50+0000\n"
"Language: Español\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -23,7 +23,14 @@ msgstr "Cierre sesión de Login.gov"

#: benefits/core/migrations/0002_sample_data.py:108
msgid "eligibility.pages.index.sample.label"
msgstr "TODO: Senior Discount Program"
msgstr "TODO: I am 65 years of age or older"

#: benefits/core/migrations/0002_sample_data.py:109
msgid "eligibility.pages.index.sample.description"
msgstr ""
"TODO: 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."

#: benefits/core/migrations/0002_sample_data.py:110
msgid "eligibility.pages.start.sample.title"
Expand Down Expand Up @@ -93,11 +100,15 @@ msgstr ""

#: benefits/core/migrations/0002_sample_data.py:140
msgid "eligibility.pages.index.mst_cc.label"
msgstr "TODO: MST Courtesy Cardholder"
msgstr "TODO: I have an MST Courtesy Card"

#: benefits/core/migrations/0002_sample_data.py:141
msgid "eligibility.pages.index.mst_cc.description"
msgstr "TODO: (includes MST RIDES Paratransit Eligibility cardholders)"
msgstr ""
"TODO: This option is for people who have a current Courtesy Card (includes "
"MST RIDES Eligibility cardholders). This benefit is part of a demonstration "
"tool and may need to be renewed in the future. Using this benefit means your "
"new transit fare is half of the standard fare."

#: benefits/core/migrations/0002_sample_data.py:142
msgid "eligibility.pages.start.mst_cc.headline"
Expand Down Expand Up @@ -534,9 +545,13 @@ msgstr "TODO: Connect your MST Benefit to your Contactless Card"
msgid "core.buttons.back"
msgstr "Regresar a la página principal"

#: benefits/eligibility/forms.py:23 benefits/eligibility/views.py:76
msgid "eligibility.buttons.continue"
msgstr "Continuar"
#: benefits/eligibility/forms.py:21
msgid "eligibility.pages.index.label"
msgstr "TODO: Select the option that best applies to you:"

#: benefits/eligibility/forms.py:23
msgid "eligibility.buttons.choose"
msgstr "TODO: Choose this Benefit"

#: benefits/eligibility/forms.py:41
msgid "eligibility.forms.confirm.submit"
Expand All @@ -554,57 +569,74 @@ msgstr "Verifique su entrada. El formato parece incorrecto."
msgid "eligibility.forms.confirm.errors.missing"
msgstr "Este campo es requerido."

#: benefits/eligibility/views.py:39
#: benefits/eligibility/views.py:42
msgid "eligibility.pages.index.title"
msgstr "TODO"
msgstr "TODO: Select a benefit option"

#: benefits/eligibility/views.py:40
#: benefits/eligibility/views.py:43
msgid "eligibility.pages.index.content_title"
msgstr "TODO"
msgstr ""
"TODO: Connect your bank card to your public transit discount with Cal-ITP "
"Benefits"

#: benefits/eligibility/views.py:45
#, python-format
msgid "eligibility.pages.index.p[0]%(info_link)s"
msgstr ""
"TODO: You can tap your credit or debit card when you board, and your "
"discount will automatically apply every time you ride. Cal-ITP doesn’t save "
"any of your information, and you don’t need to create an account. Verify for "
"your benefit, and connect your bank card today. <strong><a class='info-link' "
"href=\"%(info_link)s\">Learn more about Cal-ITP Benefits</a></strong><span "
"class='period'>.</span>"

#: benefits/eligibility/views.py:82
msgid "eligibility.buttons.continue"
msgstr "Continuar"

#: benefits/eligibility/views.py:80 benefits/enrollment/views.py:80
#: benefits/eligibility/views.py:86 benefits/enrollment/views.py:80
msgctxt "image alt text"
msgid "core.icons.idcardcheck"
msgstr "Icono de tarjeta de identificación con marca de verificación"

#: benefits/eligibility/views.py:90
#: benefits/eligibility/views.py:96
msgid "eligibility.pages.start.mst_login.link_text"
msgstr ""
"Conozca más sobre Login.gov y cómo proporcionar una prueba de identidad."

#: benefits/eligibility/views.py:95
#: benefits/eligibility/views.py:101
msgid "eligibility.pages.start.mst_login.required_items[0]"
msgstr "Su tarjeta de identificación emitida por el estado"

#: benefits/eligibility/views.py:96
#: benefits/eligibility/views.py:102
msgid "eligibility.pages.start.mst_login.required_items[1]"
msgstr "Su número de Seguro Social"

#: benefits/eligibility/views.py:97
#: benefits/eligibility/views.py:103
msgid "eligibility.pages.start.mst_login.required_items[2]"
msgstr "Un número de teléfono con un plan de teléfono asociado con su nombre"

#: benefits/eligibility/views.py:108 benefits/enrollment/views.py:150
#: benefits/eligibility/views.py:114 benefits/enrollment/views.py:150
msgctxt "image alt text"
msgid "core.icons.bankcardcheck"
msgstr ""
"Icono de tarjeta bancaria con símbolo sin contacto y marca de verificación"

#: benefits/eligibility/views.py:109
#: benefits/eligibility/views.py:115
msgid "eligibility.pages.start.bankcard.title"
msgstr "Los datos de su tarjeta bancaria"

#: benefits/eligibility/views.py:110
#: benefits/eligibility/views.py:116
msgid "eligibility.pages.start.bankcard.text"
msgstr ""
"Su tarjeta debe ser una tarjeta de débito o crédito sin contacto de Visa o "
"Mastercard."

#: benefits/eligibility/views.py:116
#: benefits/eligibility/views.py:122
msgid "eligibility.pages.start.title"
msgstr "Comencemos"

#: benefits/eligibility/views.py:227
#: benefits/eligibility/views.py:234
msgctxt "image alt text"
msgid "core.icons.idcardquestion"
msgstr "Icono de tarjeta de identificación con signo de interrogación"
Expand Down