From 4924eaa5e0e1d34ab0c0e93a830a55e9830517bd Mon Sep 17 00:00:00 2001 From: Angela Tran Date: Fri, 21 Jul 2023 18:32:38 +0000 Subject: [PATCH] refactor(copy): reuse msgids from contactless help modal --- benefits/core/templates/core/help.html | 14 +++-- .../includes/modal--contactless.html | 1 + benefits/locale/en/LC_MESSAGES/django.po | 62 ++++++------------- benefits/locale/es/LC_MESSAGES/django.po | 62 ++++++------------- 4 files changed, 47 insertions(+), 92 deletions(-) diff --git a/benefits/core/templates/core/help.html b/benefits/core/templates/core/help.html index b0e3f54da1..836ad062b0 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 "core.pages.help.payment_options.p[1]" %}

+

{% 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[2]" %}

-

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

+

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

+

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

- {% if agency.info_url %} - {% blocktranslate with website=agency.info_url %}core.pages.help.payment_options.p[4]{{ website }}{% endblocktranslate %} + {% if agency %} + {% 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 %} {% endif %}

diff --git a/benefits/eligibility/templates/eligibility/includes/modal--contactless.html b/benefits/eligibility/templates/eligibility/includes/modal--contactless.html index 4af3cb99b2..55af39ad6c 100644 --- a/benefits/eligibility/templates/eligibility/includes/modal--contactless.html +++ b/benefits/eligibility/templates/eligibility/includes/modal--contactless.html @@ -14,6 +14,7 @@

{% translate "eligibility.pages.start.modal.title" %} src="{% static 'img/icon/contactless.svg' %}" alt="{% translate "core.icons.contactless" context "image alt text" %}" />

+

{% 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 %} diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index fa4caf083e..920d55016b 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 17:59+0000\n" +"POT-Creation-Date: 2023-07-21 18:32+0000\n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,23 +82,23 @@ msgstr "" msgid "core.pages.help.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 "" "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 "core.pages.help.payment_options.p[1]" +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[2]" +msgid "eligibility.pages.start.modal.p[2]" msgstr "Your card must include a Visa or Mastercard logo." -msgid "core.pages.help.payment_options.p[3]" +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 " @@ -106,12 +106,21 @@ msgstr "" "debit card." #, python-format -msgid "core.pages.help.payment_options.p[4]%(website)s" +msgid "eligibility.pages.start.modal.p[4.1]%(agency_short_name)s" msgstr "" -"You can still get your transit benefit by going through your [short name]'s " -"application process. For updates on additional options, please check back on " -"this website, or contact [short name]." +"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.pages.help.login_gov" msgstr "What is Login.gov?" @@ -373,39 +382,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[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 22879684f1..910c91270f 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 17:59+0000\n" +"POT-Creation-Date: 2023-07-21 18:32+0000\n" "Language: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,23 +85,23 @@ msgstr "" msgid "core.pages.help.payment_options" 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 "" "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 "core.pages.help.payment_options.p[1]" +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[2]" +msgid "eligibility.pages.start.modal.p[2]" msgstr "TODO: Your card must include a Visa or Mastercard logo." -msgid "core.pages.help.payment_options.p[3]" +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 " @@ -109,12 +109,21 @@ msgstr "" "Mastercard debit card." #, python-format -msgid "core.pages.help.payment_options.p[4]%(website)s" +msgid "eligibility.pages.start.modal.p[4.1]%(agency_short_name)s" msgstr "" -"You can still get your transit benefit by going through your [short name]'s " -"application process. For updates on additional options, please check back on " -"this website, or contact [short name]." +"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.pages.help.login_gov" msgstr "¿Qué es Login.gov?" @@ -383,39 +392,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[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"