diff --git a/benefits/core/templates/core/help.html b/benefits/core/templates/core/help.html index b5c32c12d..e9488ffdb 100644 --- a/benefits/core/templates/core/help.html +++ b/benefits/core/templates/core/help.html @@ -17,8 +17,8 @@

{% translate "core.pages.help.about" %}{% translate "core.pages.help.about.p[1]" %}

{% translate "core.pages.help.payment_options" %}

-

{% translate "core.pages.help.payment_options.p[0]" %}

- +

{% translate "eligibility.pages.start.modal.p[0]" %}

+

{% translate "eligibility.pages.start.modal.p[1]" %}

{% translate "core.pages.help.payment_opti src="{% static 'img/icon/contactless.svg' %}" alt="{% translate "core.icons.contactless" context "image alt text" %}" />

- -

{% translate "core.pages.help.payment_options.p[1]" %}

-

- {% blocktranslate with website="https://cash.app/help/us/en-us/14425-cal-transit" %}core.pages.help.payment_options.p[2][0]{{ website }}{% endblocktranslate %} - {% blocktranslate with website="https://venmo.com/about/debitcard/" %}core.pages.help.payment_options.p[2][1]{{ website }}{% endblocktranslate %} -

-

{% translate "core.pages.help.payment_options.p[3]" %}

-

{% translate "core.pages.help.payment_options.p[4]" %}

+

{% translate "eligibility.pages.start.modal.p[2]" %}

+

{% translate "eligibility.pages.start.modal.p[3]" %}

+ {% if agency %} +

+ {% blocktranslate with short_name=agency.short_name website=agency.info_url %}eligibility.pages.start.modal.p[4]{{ short_name }}{{ website }}{% endblocktranslate %} +

+ {% endif %}

{% translate "core.pages.help.login_gov" %}

{% translate "core.pages.help.login_gov.p[0]" %}

diff --git a/benefits/eligibility/templates/eligibility/includes/modal--contactless.html b/benefits/eligibility/templates/eligibility/includes/modal--contactless.html index 55af39ad6..ec13073e0 100644 --- a/benefits/eligibility/templates/eligibility/includes/modal--contactless.html +++ b/benefits/eligibility/templates/eligibility/includes/modal--contactless.html @@ -17,9 +17,7 @@

{% translate "eligibility.pages.start.modal.title" %}

{% translate "eligibility.pages.start.modal.p[2]" %}

{% translate "eligibility.pages.start.modal.p[3]" %}

- {% blocktranslate with agency_short_name=agency.short_name %}eligibility.pages.start.modal.p[4.1]{{agency_short_name}}{% endblocktranslate %} - {% blocktranslate with agency_info_url=agency.info_url %}eligibility.pages.start.modal.p[4.2]{{agency_info_url}}{% endblocktranslate %} - {% blocktranslate with agency_short_name=agency.short_name %}eligibility.pages.start.modal.p[4.3]{{agency_short_name}}{% endblocktranslate %} + {% blocktranslate with short_name=agency.short_name website=agency.info_url %}eligibility.pages.start.modal.p[4]{{ short_name }}{{ website }}{% endblocktranslate %}

{% translate "core.modals.back" %} diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index a49a785e1..0c5224e1b 100644 --- a/benefits/locale/en/LC_MESSAGES/django.po +++ b/benefits/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n" -"POT-Creation-Date: 2023-07-21 16:47+0000\n" +"POT-Creation-Date: 2023-07-25 17:28+0000\n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,46 +80,38 @@ msgstr "" "benefit to the rider's contactless card of choice." msgid "core.pages.help.payment_options" -msgstr "Payment options" +msgstr "What kind of credit card can I use?" -msgid "core.pages.help.payment_options.p[0]" +msgid "eligibility.pages.start.modal.p[0]" msgstr "" -"In order to activate your discount, you need a bank card that has the " -"contactless symbol on it. The contactless symbol is four curved lines that " -"looks like this:" +"Benefits only works with contactless debit or credit cards. We do not " +"currently support mobile wallets or digital cards, such as Apple Pay, Google " +"Wallet, or Samsung Wallet." + +msgid "eligibility.pages.start.modal.p[1]" +msgstr "The contactless symbol is four curved lines, like this:" msgctxt "image alt text" msgid "core.icons.contactless" msgstr "Four curved lines on contactless-enabled cards" -msgid "core.pages.help.payment_options.p[1]" -msgstr "" -"A contactless bank card can be a credit card or a debit card and must " -"include a Visa or Mastercard logo." +msgid "eligibility.pages.start.modal.p[2]" +msgstr "Your card must include a Visa or Mastercard logo." -#, python-format -msgid "core.pages.help.payment_options.p[2][0]%(website)s" +msgid "eligibility.pages.start.modal.p[3]" msgstr "" -"Don’t have access to a bank card? You can request a contactless card from " -"one of the companies that offer free contactless prepaid debit cards, such " -"as the Cash App Visa Debit Card " +"Don’t have access to a contactless card? You can request a contactless card " +"from your bank, or one of the companies that offer free contactless prepaid " +"debit cards, such as the Cash App Visa debit card or the Venmo Mastercard " +"debit card." #, python-format -msgid "core.pages.help.payment_options.p[2][1]%(website)s" -msgstr "" -"or the Venmo Mastercard Debit Card." - -msgid "core.pages.help.payment_options.p[3]" -msgstr "" -"You can still get your discount by going through your local transit " -"provider’s application process." - -msgid "core.pages.help.payment_options.p[4]" +msgid "eligibility.pages.start.modal.p[4]%(short_name)s%(website)s" msgstr "" -"For updates on additional options, please check back on this website, or get " -"in touch with your local transit provider." +"You can still get your transit benefit by going through your " +"%(short_name)s's application process. For updates on additional options, " +"please check back on this website, or contact %(short_name)s." msgid "core.pages.help.login_gov" msgstr "What is Login.gov?" @@ -381,42 +373,6 @@ msgctxt "image alt text" msgid "core.icons.idcardcheck" msgstr "Identification card icon with checkmark" -msgid "eligibility.pages.start.modal.p[0]" -msgstr "" -"Benefits only works with contactless debit or credit cards. We do not " -"currently support mobile wallets or digital cards, such as Apple Pay, Google " -"Wallet, or Samsung Wallet." - -msgid "eligibility.pages.start.modal.p[1]" -msgstr "The contactless symbol is four curved lines, like this:" - -msgid "eligibility.pages.start.modal.p[2]" -msgstr "Your card must include a Visa or Mastercard logo." - -msgid "eligibility.pages.start.modal.p[3]" -msgstr "" -"Don’t have access to a contactless card? You can request a contactless card " -"from your bank, or one of the companies that offer free contactless prepaid " -"debit cards, such as the Cash App Visa debit card or the Venmo Mastercard " -"debit card." - -#, python-format -msgid "eligibility.pages.start.modal.p[4.1]%(agency_short_name)s" -msgstr "" -"You can still get your transit benefit by going through your " -"%(agency_short_name)s application process. For updates on additional " -"options, please check back on this website, or contact " - -#, python-format -msgid "eligibility.pages.start.modal.p[4.2]%(agency_info_url)s" -msgstr "" -"" - -#, python-format -msgid "eligibility.pages.start.modal.p[4.3]%(agency_short_name)s" -msgstr "%(agency_short_name)s." - msgid "core.modals.back" msgstr "Go back" diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index c736edf25..ce9b620e8 100644 --- a/benefits/locale/es/LC_MESSAGES/django.po +++ b/benefits/locale/es/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n" -"POT-Creation-Date: 2023-07-21 16:47+0000\n" +"POT-Creation-Date: 2023-07-25 17:28+0000\n" "Language: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,46 +83,38 @@ msgstr "" "benefit to the rider's contactless card of choice." msgid "core.pages.help.payment_options" -msgstr "Opciones de pago" +msgstr "TODO: What kind of credit card can I use?" -msgid "core.pages.help.payment_options.p[0]" +msgid "eligibility.pages.start.modal.p[0]" msgstr "" -"Para activar su descuento, necesita una tarjeta bancaria que tenga el " -"símbolo de sin contacto. El símbolo sin contacto son cuatro líneas curvas " -"que se ven así:" +"TODO: Benefits only works with contactless debit or credit cards. We do not " +"currently support mobile wallets or digital cards, such as Apple Pay, Google " +"Wallet, or Samsung Wallet." + +msgid "eligibility.pages.start.modal.p[1]" +msgstr "TODO: The contactless symbol is four curved lines, like this:" msgctxt "image alt text" msgid "core.icons.contactless" msgstr "Cuatro líneas curvas en las tarjetas habilitadas sin contacto" -msgid "core.pages.help.payment_options.p[1]" -msgstr "" -"Una tarjeta bancaria sin contacto puede ser una tarjeta de crédito o de " -"débito y debe incluir el logotipo de Visa o Mastercard." +msgid "eligibility.pages.start.modal.p[2]" +msgstr "TODO: Your card must include a Visa or Mastercard logo." -#, python-format -msgid "core.pages.help.payment_options.p[2][0]%(website)s" +msgid "eligibility.pages.start.modal.p[3]" msgstr "" -"¿No tienes acceso a una tarjeta bancaria? Puedes solicitar una tarjeta sin " -"contacto de una de las compañías que ofrecen tarjetas de débito prepago sin " -"contacto gratuitas, como la tarjeta de débito Cash App Visa " +"TODO: Don’t have access to a contactless card? You can request a contactless " +"card from your bank, or one of the companies that offer free contactless " +"prepaid debit cards, such as the Cash App Visa debit card or the Venmo " +"Mastercard debit card." #, python-format -msgid "core.pages.help.payment_options.p[2][1]%(website)s" -msgstr "" -"o la tarjeta de débito Venmo Mastercard." - -msgid "core.pages.help.payment_options.p[3]" -msgstr "" -"Todavía puede obtener su descuento mediante el proceso de solicitud de su " -"proveedor de transporte local." - -msgid "core.pages.help.payment_options.p[4]" +msgid "eligibility.pages.start.modal.p[4]%(short_name)s%(website)s" msgstr "" -"Para obtener actualizaciones sobre opciones adicionales, vuelva a consultar " -"este sitio web o comuníquese con su proveedor de transporte local." +"TODO: You can still get your transit benefit by going through your " +"%(short_name)s's application process. For updates on additional options, " +"please check back on this website, or contact %(short_name)s." msgid "core.pages.help.login_gov" msgstr "¿Qué es Login.gov?" @@ -391,42 +383,6 @@ msgctxt "image alt text" msgid "core.icons.idcardcheck" msgstr "Icono de tarjeta de identificación con marca de verificación" -msgid "eligibility.pages.start.modal.p[0]" -msgstr "" -"TODO: Benefits only works with contactless debit or credit cards. We do not " -"currently support mobile wallets or digital cards, such as Apple Pay, Google " -"Wallet, or Samsung Wallet." - -msgid "eligibility.pages.start.modal.p[1]" -msgstr "TODO: The contactless symbol is four curved lines, like this:" - -msgid "eligibility.pages.start.modal.p[2]" -msgstr "TODO: Your card must include a Visa or Mastercard logo." - -msgid "eligibility.pages.start.modal.p[3]" -msgstr "" -"TODO: Don’t have access to a contactless card? You can request a contactless " -"card from your bank, or one of the companies that offer free contactless " -"prepaid debit cards, such as the Cash App Visa debit card or the Venmo " -"Mastercard debit card." - -#, python-format -msgid "eligibility.pages.start.modal.p[4.1]%(agency_short_name)s" -msgstr "" -"TODO: You can still get your transit benefit by going through your " -"%(agency_short_name)s application process. For updates on additional " -"options, please check back on this website, or contact " - -#, python-format -msgid "eligibility.pages.start.modal.p[4.2]%(agency_info_url)s" -msgstr "" -"" - -#, python-format -msgid "eligibility.pages.start.modal.p[4.3]%(agency_short_name)s" -msgstr "%(agency_short_name)s." - msgid "core.modals.back" msgstr "TODO: Regresar a la página principal"