From 14bcb1adfe9f0f2593c5206e60f91353b59b5847 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 18 Dec 2024 03:12:30 +0000 Subject: [PATCH 1/6] fix(unverified): set up unverified-base to be inherited by unverified--agency pages --- .../eligibility/unverified--cst-agency-card.html | 11 +---------- .../eligibility/unverified--mst-agency-card.html | 11 +---------- .../eligibility/unverified--sbmtd-agency-card.html | 11 +---------- .../{unverified.html => unverified-base.html} | 5 ++--- 4 files changed, 5 insertions(+), 33 deletions(-) rename benefits/eligibility/templates/eligibility/{unverified.html => unverified-base.html} (74%) diff --git a/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html b/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html index 9f51e3ba92..cf13f3ba1d 100644 --- a/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html +++ b/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html @@ -1,15 +1,6 @@ -{% extends "eligibility/unverified.html" %} +{% extends "eligibility/unverified-base.html" %} {% load i18n %} -{% block unverified-headline %} - {% translate "Your card information may not have been entered correctly." %} -{% endblock unverified-headline %} - {% block unverified-body %} {% translate "The number and last name must be entered exactly as they appear on your CST Agency Card. Please check your card and try again, or contact your transit agency for help." %} {% endblock unverified-body %} - -{% block unverified-call-to-action %} - {% translate "Try again" as button_text %} -
{% include "core/includes/button--origin.html" with button_text=button_text %}
-{% endblock unverified-call-to-action %} diff --git a/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html b/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html index b1b710d38a..dce3ac0f13 100644 --- a/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html +++ b/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html @@ -1,15 +1,6 @@ -{% extends "eligibility/unverified.html" %} +{% extends "eligibility/unverified-base.html" %} {% load i18n %} -{% block unverified-headline %} - {% translate "Your card information may not have been entered correctly." %} -{% endblock unverified-headline %} - {% block unverified-body %} {% translate "The number and last name must be entered exactly as they appear on your MST Courtesy Card. Please check your card and try again, or contact your transit agency for help." %} {% endblock unverified-body %} - -{% block unverified-call-to-action %} - {% translate "Try again" as button_text %} -
{% include "core/includes/button--origin.html" with button_text=button_text %}
-{% endblock unverified-call-to-action %} diff --git a/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html b/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html index 828fa18030..fb37c15696 100644 --- a/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html +++ b/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html @@ -1,15 +1,6 @@ -{% extends "eligibility/unverified.html" %} +{% extends "eligibility/unverified-base.html" %} {% load i18n %} -{% block unverified-headline %} - {% translate "Your card information may not have been entered correctly." %} -{% endblock unverified-headline %} - {% block unverified-body %} {% translate "The number and last name must be entered exactly as they appear on your SBMTD Reduced Fare Mobility ID card. Please check your card and try again, or contact your transit agency for help." %} {% endblock unverified-body %} - -{% block unverified-call-to-action %} - {% translate "Try again" as button_text %} -
{% include "core/includes/button--origin.html" with button_text=button_text %}
-{% endblock unverified-call-to-action %} diff --git a/benefits/eligibility/templates/eligibility/unverified.html b/benefits/eligibility/templates/eligibility/unverified-base.html similarity index 74% rename from benefits/eligibility/templates/eligibility/unverified.html rename to benefits/eligibility/templates/eligibility/unverified-base.html index 3bc4c1114e..bcb4282632 100644 --- a/benefits/eligibility/templates/eligibility/unverified.html +++ b/benefits/eligibility/templates/eligibility/unverified-base.html @@ -16,19 +16,18 @@ {% endblock icon %} {% block headline-text %} - {% translate "Your eligibility could not be verified." %} + {% translate "Your card information may not have been entered correctly." %} {% endblock headline-text %} {% block paragraphs %}

{% block unverified-body %} - {% translate "That’s okay! You may still be eligible for our program." %} - {% blocktranslate with short_name=agency.short_name %}Please reach out to {{ short_name }} for assistance.{% endblocktranslate %} {% endblock unverified-body %}

{% include "core/includes/agency-links.html" %} {% endblock paragraphs %} {% block call-to-action-button %} + {% translate "Try again" as button_text %} {% include "core/includes/button--index.html" %} {% endblock call-to-action-button %} From d8dd84d9255a49dc0b47117b34a13e7868aa91f1 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 18 Dec 2024 03:14:44 +0000 Subject: [PATCH 2/6] chore: make messages --- benefits/locale/en/LC_MESSAGES/django.po | 16 +++------------- benefits/locale/es/LC_MESSAGES/django.po | 24 +++++++----------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index 1b40940fa6..6953e65ba7 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-12-09 13:27-0800\n" +"POT-Creation-Date: 2024-12-17 19:14-0800\n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -670,18 +670,12 @@ msgstr "" msgid "You will need a few items to continue:" msgstr "" -msgid "Your card information may not have been entered correctly." -msgstr "" - msgid "" "The number and last name must be entered exactly as they appear on your CST " "Agency Card. Please check your card and try again, or contact your transit " "agency for help." msgstr "" -msgid "Try again" -msgstr "" - msgid "" "The number and last name must be entered exactly as they appear on your MST " "Courtesy Card. Please check your card and try again, or contact your transit " @@ -697,14 +691,10 @@ msgstr "" msgid "Unable to confirm eligibility" msgstr "" -msgid "Your eligibility could not be verified." -msgstr "" - -msgid "That’s okay! You may still be eligible for our program." +msgid "Your card information may not have been entered correctly." msgstr "" -#, python-format -msgid "Please reach out to %(short_name)s for assistance." +msgid "Try again" msgstr "" msgid "Do not enter information from your EBT card." diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index 1f40c5888a..5ba0de7b89 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-12-09 13:27-0800\n" +"POT-Creation-Date: 2024-12-17 19:14-0800\n" "Language: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -855,11 +855,6 @@ msgstr "Ha seleccionado un beneficio de tránsito para veteranos." msgid "You will need a few items to continue:" msgstr "Necesitará algunos artículos para continuar:" -msgid "Your card information may not have been entered correctly." -msgstr "" -"Es posible que la información de su tarjeta no se haya ingresado " -"correctamente." - msgid "" "The number and last name must be entered exactly as they appear on your CST " "Agency Card. Please check your card and try again, or contact your transit " @@ -869,9 +864,6 @@ msgstr "" "tarjeta de agencia de CST. Verifique su tarjeta e inténtelo de nuevo, o " "contacte a su agencia de tránsito para obtener ayuda." -msgid "Try again" -msgstr "Inténtelo de nuevo" - msgid "" "The number and last name must be entered exactly as they appear on your MST " "Courtesy Card. Please check your card and try again, or contact your transit " @@ -893,15 +885,13 @@ msgstr "" msgid "Unable to confirm eligibility" msgstr "No se pudo confirmar la elegibilidad" -msgid "Your eligibility could not be verified." -msgstr "No se pudo verificar su elegibilidad." - -msgid "That’s okay! You may still be eligible for our program." -msgstr "¡Está bien! Usted aún puede ser elegible para nuestro programa." +msgid "Your card information may not have been entered correctly." +msgstr "" +"Es posible que la información de su tarjeta no se haya ingresado " +"correctamente." -#, python-format -msgid "Please reach out to %(short_name)s for assistance." -msgstr "Comuníquese con %(short_name)s para obtener ayuda." +msgid "Try again" +msgstr "Inténtelo de nuevo" msgid "Do not enter information from your EBT card." msgstr "No ingrese información de su tarjeta EBT." From 2ef3421f126d4a59cdcfa2210b9522b75025537e Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 18 Dec 2024 04:02:52 +0000 Subject: [PATCH 3/6] fix(unverified): undo filename changes --- .../templates/eligibility/unverified--cst-agency-card.html | 2 +- .../templates/eligibility/unverified--mst-agency-card.html | 2 +- .../templates/eligibility/unverified--sbmtd-agency-card.html | 2 +- .../eligibility/{unverified-base.html => unverified.html} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename benefits/eligibility/templates/eligibility/{unverified-base.html => unverified.html} (100%) diff --git a/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html b/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html index cf13f3ba1d..ccd38e0928 100644 --- a/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html +++ b/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html @@ -1,4 +1,4 @@ -{% extends "eligibility/unverified-base.html" %} +{% extends "eligibility/unverified.html" %} {% load i18n %} {% block unverified-body %} diff --git a/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html b/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html index dce3ac0f13..c75df0dc2f 100644 --- a/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html +++ b/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html @@ -1,4 +1,4 @@ -{% extends "eligibility/unverified-base.html" %} +{% extends "eligibility/unverified.html" %} {% load i18n %} {% block unverified-body %} diff --git a/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html b/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html index fb37c15696..e5c681bc41 100644 --- a/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html +++ b/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html @@ -1,4 +1,4 @@ -{% extends "eligibility/unverified-base.html" %} +{% extends "eligibility/unverified.html" %} {% load i18n %} {% block unverified-body %} diff --git a/benefits/eligibility/templates/eligibility/unverified-base.html b/benefits/eligibility/templates/eligibility/unverified.html similarity index 100% rename from benefits/eligibility/templates/eligibility/unverified-base.html rename to benefits/eligibility/templates/eligibility/unverified.html From 635c638adde00a1545d49cbe524c48c677fff867 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 19 Dec 2024 17:22:32 +0000 Subject: [PATCH 4/6] fix(unverified): create separate base for unverified agency cards, fix copy for unverified login/nonlogin --- .../unverified--cst-agency-card.html | 2 +- .../unverified--mst-agency-card.html | 2 +- .../unverified--sbmtd-agency-card.html | 2 +- .../unverified-error-agency-base.html | 33 +++++++++++++++++++ .../templates/eligibility/unverified.html | 7 ++-- 5 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 benefits/eligibility/templates/eligibility/unverified-error-agency-base.html diff --git a/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html b/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html index ccd38e0928..8e1a64fded 100644 --- a/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html +++ b/benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html @@ -1,4 +1,4 @@ -{% extends "eligibility/unverified.html" %} +{% extends "eligibility/unverified-error-agency-base.html" %} {% load i18n %} {% block unverified-body %} diff --git a/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html b/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html index c75df0dc2f..683285f9b0 100644 --- a/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html +++ b/benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html @@ -1,4 +1,4 @@ -{% extends "eligibility/unverified.html" %} +{% extends "eligibility/unverified-error-agency-base.html" %} {% load i18n %} {% block unverified-body %} diff --git a/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html b/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html index e5c681bc41..92cf826c67 100644 --- a/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html +++ b/benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html @@ -1,4 +1,4 @@ -{% extends "eligibility/unverified.html" %} +{% extends "eligibility/unverified-error-agency-base.html" %} {% load i18n %} {% block unverified-body %} diff --git a/benefits/eligibility/templates/eligibility/unverified-error-agency-base.html b/benefits/eligibility/templates/eligibility/unverified-error-agency-base.html new file mode 100644 index 0000000000..bcb4282632 --- /dev/null +++ b/benefits/eligibility/templates/eligibility/unverified-error-agency-base.html @@ -0,0 +1,33 @@ +{% extends "error-base.html" %} +{% load i18n %} + +{% block page-title %} + {% translate "Unable to confirm eligibility" %} +{% endblock page-title %} + +{% block nav-buttons %} + {% if authentication and authentication.sign_out_link_template %} + {% include authentication.sign_out_link_template %} + {% endif %} +{% endblock nav-buttons %} + +{% block icon %} + {% include "core/includes/icon.html" with name="idcardquestion" %} +{% endblock icon %} + +{% block headline-text %} + {% translate "Your card information may not have been entered correctly." %} +{% endblock headline-text %} + +{% block paragraphs %} +

+ {% block unverified-body %} + {% endblock unverified-body %} +

+ {% include "core/includes/agency-links.html" %} +{% endblock paragraphs %} + +{% block call-to-action-button %} + {% translate "Try again" as button_text %} + {% include "core/includes/button--index.html" %} +{% endblock call-to-action-button %} diff --git a/benefits/eligibility/templates/eligibility/unverified.html b/benefits/eligibility/templates/eligibility/unverified.html index bcb4282632..ce11fea5a4 100644 --- a/benefits/eligibility/templates/eligibility/unverified.html +++ b/benefits/eligibility/templates/eligibility/unverified.html @@ -16,18 +16,17 @@ {% endblock icon %} {% block headline-text %} - {% translate "Your card information may not have been entered correctly." %} + {% translate "Your eligibility could not be verified." %} {% endblock headline-text %} {% block paragraphs %}

- {% block unverified-body %} - {% endblock unverified-body %} + {% translate "That’s okay! You may still be eligible for our program." %} + {% blocktranslate with short_name=agency.short_name %}Please reach out to {{ short_name }} for assistance.{% endblocktranslate %}

{% include "core/includes/agency-links.html" %} {% endblock paragraphs %} {% block call-to-action-button %} - {% translate "Try again" as button_text %} {% include "core/includes/button--index.html" %} {% endblock call-to-action-button %} From 6cb906fa4720ab0d025981334d3a08d2f4c162ea Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 19 Dec 2024 17:27:19 +0000 Subject: [PATCH 5/6] fix(unverified): add back Spanish unverified error copy for Login/nonLogin --- benefits/locale/en/LC_MESSAGES/django.po | 12 +++++++++++- benefits/locale/es/LC_MESSAGES/django.po | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index 6953e65ba7..1e5fa5c97f 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-12-17 19:14-0800\n" +"POT-Creation-Date: 2024-12-19 09:26-0800\n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -697,6 +697,16 @@ msgstr "" msgid "Try again" msgstr "" +msgid "Your eligibility could not be verified." +msgstr "" + +msgid "That’s okay! You may still be eligible for our program." +msgstr "" + +#, python-format +msgid "Please reach out to %(short_name)s for assistance." +msgstr "" + msgid "Do not enter information from your EBT card." msgstr "" diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index 5ba0de7b89..127a774021 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-12-17 19:14-0800\n" +"POT-Creation-Date: 2024-12-19 09:26-0800\n" "Language: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -893,6 +893,16 @@ msgstr "" msgid "Try again" msgstr "Inténtelo de nuevo" +msgid "Your eligibility could not be verified." +msgstr "No se pudo verificar su elegibilidad." + +msgid "That’s okay! You may still be eligible for our program." +msgstr "¡Está bien! Usted aún puede ser elegible para nuestro programa." + +#, python-format +msgid "Please reach out to %(short_name)s for assistance." +msgstr "Comuníquese con %(short_name)s para obtener ayuda." + msgid "Do not enter information from your EBT card." msgstr "No ingrese información de su tarjeta EBT." From b4e56f53bb1959f294c308a0811cbd4e58687103 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 2 Jan 2025 22:52:38 +0000 Subject: [PATCH 6/6] fix(unverified): button goes back to form, not home --- .../templates/eligibility/unverified-error-agency-base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefits/eligibility/templates/eligibility/unverified-error-agency-base.html b/benefits/eligibility/templates/eligibility/unverified-error-agency-base.html index bcb4282632..ef7edf8181 100644 --- a/benefits/eligibility/templates/eligibility/unverified-error-agency-base.html +++ b/benefits/eligibility/templates/eligibility/unverified-error-agency-base.html @@ -29,5 +29,5 @@ {% block call-to-action-button %} {% translate "Try again" as button_text %} - {% include "core/includes/button--index.html" %} + {% include "core/includes/button--origin.html" with button_text=button_text %} {% endblock call-to-action-button %}