From dc186ee1d4f65c7d3b771749484b194ce9f2cd9c Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 29 Oct 2024 18:14:25 +0000 Subject: [PATCH 1/4] feat(eligibility): remove Login.gov sentence from Calfresh, Senior, Veteran --- .../includes/selection-label--calfresh.html | 4 +--- .../includes/selection-label--senior.html | 6 +----- .../includes/selection-label--veteran.html | 7 +------ benefits/locale/en/LC_MESSAGES/django.po | 11 ++++------- benefits/locale/es/LC_MESSAGES/django.po | 19 +++++++------------ 5 files changed, 14 insertions(+), 33 deletions(-) diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--calfresh.html b/benefits/eligibility/templates/eligibility/includes/selection-label--calfresh.html index e44fe33761..de17dfd068 100644 --- a/benefits/eligibility/templates/eligibility/includes/selection-label--calfresh.html +++ b/benefits/eligibility/templates/eligibility/includes/selection-label--calfresh.html @@ -11,8 +11,6 @@ {% include "core/includes/modal-trigger.html" with modal="modal--calfresh" text=calfresh_modal_link period=True %} {% include "eligibility/includes/modal--calfresh.html" with id="modal--calfresh" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} - {% translate "This transit benefit will remain active for one year. You will need to verify your identity with" %} - {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov-veteran" login=True period=True %} - {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov-calfresh" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} + {% translate "This transit benefit will remain active for one year." %} {% endblock description %} diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html index d6d1bf28ea..17565dd59a 100644 --- a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html +++ b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html @@ -6,9 +6,5 @@ {% endblock label %} {% block description %} - {% translate "You must be 65 years or older. You will need to verify your identity with" %} - - {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %} - - {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} + {% translate "You must be 65 years or older." %} {% endblock description %} diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html index e68a7383d5..5f866bd078 100644 --- a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html +++ b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html @@ -7,11 +7,6 @@ {% block description %} {% blocktranslate trimmed %} - This option is for people who have served in the active military, naval, or air service, and who were discharged or released therefrom under conditions other than dishonorable. You will need to verify your identity with + This option is for people who have served in the active military, naval, or air service, and who were discharged or released therefrom under conditions other than dishonorable. {% endblocktranslate %} - - {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov-veteran" login=True period=True %} - - {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov-veteran" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} - {% endblock description %} diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index 96d9d380a0..ce21545858 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: 2024-10-28 16:14-0700\n" +"POT-Creation-Date: 2024-10-28 17:09-0700\n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -525,9 +525,7 @@ msgstr "" msgid "recently received CalFresh funds" msgstr "" -msgid "" -"This transit benefit will remain active for one year. You will need to " -"verify your identity with" +msgid "This transit benefit will remain active for one year." msgstr "" msgid "Agency Card" @@ -566,8 +564,7 @@ msgstr "" msgid "Older Adult" msgstr "" -msgid "" -"You must be 65 years or older. You will need to verify your identity with" +msgid "You must be 65 years or older." msgstr "" msgid "U.S. Veteran" @@ -576,7 +573,7 @@ msgstr "" msgid "" "This option is for people who have served in the active military, naval, or " "air service, and who were discharged or released therefrom under conditions " -"other than dishonorable. You will need to verify your identity with" +"other than dishonorable." msgstr "" #, python-format diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index cd4148af91..95d71d0033 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: 2024-10-28 16:14-0700\n" +"POT-Creation-Date: 2024-10-28 17:09-0700\n" "Language: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -678,12 +678,8 @@ msgstr "Debe haber" msgid "recently received CalFresh funds" msgstr "recibido fondos de CalFresh recientemente" -msgid "" -"This transit benefit will remain active for one year. You will need to " -"verify your identity with" -msgstr "" -"Este beneficio de tránsito permanecerá activo por un año. Necesitará " -"verificar su identidad con" +msgid "This transit benefit will remain active for one year." +msgstr "Este beneficio de tránsito permanecerá activo por un año." msgid "Agency Card" msgstr "Tarjeta de agencia" @@ -727,9 +723,8 @@ msgstr "" msgid "Older Adult" msgstr "Adulto mayor" -msgid "" -"You must be 65 years or older. You will need to verify your identity with" -msgstr "Debe tener 65 años o más. Deberá verificar su identidad con" +msgid "You must be 65 years or older." +msgstr "Debe tener 65 años o más." msgid "U.S. Veteran" msgstr "Veterano de EE. UU." @@ -737,11 +732,11 @@ msgstr "Veterano de EE. UU." msgid "" "This option is for people who have served in the active military, naval, or " "air service, and who were discharged or released therefrom under conditions " -"other than dishonorable. You will need to verify your identity with" +"other than dishonorable." msgstr "" "Esta opción es para personas que hayan prestado servicio militar, naval o " "aéreo de manera activa, y quienes fueron dados de baja o liberados en " -"condiciones que no hayan sido deshonrosas. Deberá verificar su identidad con" +"condiciones que no hayan sido deshonrosas." #, python-format msgid "" From 87a77ff8877a29c00f9d7160720005390d24a63a Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 29 Oct 2024 00:31:08 +0000 Subject: [PATCH 2/4] feat(eligibility): Remove Login.gov modal + copy --- .../includes/modal--login-gov-help.html | 40 ------------------- benefits/locale/en/LC_MESSAGES/django.po | 7 ---- benefits/locale/es/LC_MESSAGES/django.po | 7 ---- 3 files changed, 54 deletions(-) delete mode 100644 benefits/eligibility/templates/eligibility/includes/modal--login-gov-help.html diff --git a/benefits/eligibility/templates/eligibility/includes/modal--login-gov-help.html b/benefits/eligibility/templates/eligibility/includes/modal--login-gov-help.html deleted file mode 100644 index f37f0d81f3..0000000000 --- a/benefits/eligibility/templates/eligibility/includes/modal--login-gov-help.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "core/includes/modal.html" %} -{% load i18n %} -{% load static %} - -{% block modal-content %} -

- {% translate "Learn more about" %} - {% translate -

-
-

{% translate "What is Login.gov?" %}

-

- {% blocktranslate trimmed %} - Login.gov is a service that offers secure and private online access to government programs, such as federal - benefits, services and applications. With a Login.gov account, you can sign into multiple government websites with - the same email address and password. - {% endblocktranslate %} -

- -

{% translate "Why is Cal-ITP Benefits using Login.gov?" %}

-

- {% blocktranslate trimmed %} - Login.gov uses two-factor authentication, and stronger passwords, that meet new National Institute of Standards and - Technology requirements for secure validation and verification. By using Login.gov, you’ll get an extra layer of - security to help protect your account against password compromises. - {% endblocktranslate %} -

- -

- {% blocktranslate trimmed %} - For more information on Login.gov, please visit the - Login.gov Help Center. - {% endblocktranslate %} -

- -

- {% translate "Go back" %} -

-
-{% endblock modal-content %} diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index ce21545858..1589707b46 100644 --- a/benefits/locale/en/LC_MESSAGES/django.po +++ b/benefits/locale/en/LC_MESSAGES/django.po @@ -498,13 +498,6 @@ msgstr "" msgid "Go back" msgstr "" -msgid "Learn more about" -msgstr "" - -msgctxt "image alt text" -msgid "Login.gov" -msgstr "" - msgid "Verify your identity with " msgstr "" diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index 95d71d0033..083301ac4c 100644 --- a/benefits/locale/es/LC_MESSAGES/django.po +++ b/benefits/locale/es/LC_MESSAGES/django.po @@ -648,13 +648,6 @@ msgstr "" msgid "Go back" msgstr "Volver" -msgid "Learn more about" -msgstr "Más información sobre" - -msgctxt "image alt text" -msgid "Login.gov" -msgstr "Login.gov" - msgid "Verify your identity with " msgstr "Verifique su identidad con " From e484bbf560c53b3eb98752adec595c1b1de159c4 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 29 Oct 2024 00:46:03 +0000 Subject: [PATCH 3/4] feat(modal): remove Login modal trigger code --- benefits/core/templates/core/includes/modal-trigger.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefits/core/templates/core/includes/modal-trigger.html b/benefits/core/templates/core/includes/modal-trigger.html index cfee83a232..d254719dbf 100644 --- a/benefits/core/templates/core/includes/modal-trigger.html +++ b/benefits/core/templates/core/includes/modal-trigger.html @@ -1,4 +1,4 @@ {# djlint:off #} -{{ text }}{% if login %}{% endif %}{% if period %}.{% endif %} +{{ text }}{% if period %}.{% endif %} {# djlint:on #} From cf5b28f697dabc588af0c5ceaaa0a76d0c321949 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 29 Oct 2024 18:20:52 +0000 Subject: [PATCH 4/4] fix(copy): bring back image alt tag --- benefits/locale/en/LC_MESSAGES/django.po | 6 +++++- benefits/locale/es/LC_MESSAGES/django.po | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index 1589707b46..924b0d64a7 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: 2024-10-28 17:09-0700\n" +"POT-Creation-Date: 2024-10-29 11:20-0700\n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -501,6 +501,10 @@ msgstr "" msgid "Verify your identity with " msgstr "" +msgctxt "image alt text" +msgid "Login.gov" +msgstr "" + msgid "" "We use Login.gov to verify your identity to make sure you are eligible for " "the transit benefit you selected." diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index 083301ac4c..a721796b70 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: 2024-10-28 17:09-0700\n" +"POT-Creation-Date: 2024-10-29 11:20-0700\n" "Language: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -651,6 +651,10 @@ msgstr "Volver" msgid "Verify your identity with " msgstr "Verifique su identidad con " +msgctxt "image alt text" +msgid "Login.gov" +msgstr "Login.gov" + msgid "" "We use Login.gov to verify your identity to make sure you are eligible for " "the transit benefit you selected."