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.

Sign up for GitHub

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

reCAPTCHA: Fix Unverified error pages #2597

Open
wants to merge 5 commits into
base: refactor/recaptcha-copy
Choose a base branch
from
Open

reCAPTCHA: Fix Unverified error pages #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14bcb1a
fix(unverified): set up unverified-base to be inherited by unverified…
machikoyasuda Dec 18, 2024
d8dd84d
chore: make messages
machikoyasuda Dec 18, 2024
2ef3421
fix(unverified): undo filename changes
machikoyasuda Dec 18, 2024
635c638
fix(unverified): create separate base for unverified agency cards, fi…
machikoyasuda Dec 19, 2024
6cb906f
fix(unverified): add back Spanish unverified error copy for Login/non…
machikoyasuda Dec 19, 2024
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
11 changes: 1 addition & 10 deletions benefits/eligibility/templates/eligibility/unverified--cst-agency-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
{% extends "eligibility/unverified.html" %}
{% extends "eligibility/unverified-error-agency-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 %}
<div class="col-lg-3 col-8">{% include "core/includes/button--origin.html" with button_text=button_text %}</div>
{% endblock unverified-call-to-action %}
11 changes: 1 addition & 10 deletions benefits/eligibility/templates/eligibility/unverified--mst-agency-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
{% extends "eligibility/unverified.html" %}
{% extends "eligibility/unverified-error-agency-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 %}
<div class="col-lg-3 col-8">{% include "core/includes/button--origin.html" with button_text=button_text %}</div>
{% endblock unverified-call-to-action %}
11 changes: 1 addition & 10 deletions benefits/eligibility/templates/eligibility/unverified--sbmtd-agency-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
{% extends "eligibility/unverified.html" %}
{% extends "eligibility/unverified-error-agency-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 %}
<div class="col-lg-3 col-8">{% include "core/includes/button--origin.html" with button_text=button_text %}</div>
{% endblock unverified-call-to-action %}
33 changes: 33 additions & 0 deletions benefits/eligibility/templates/eligibility/unverified-error-agency-base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}
<p>
{% block unverified-body %}
{% endblock unverified-body %}
</p>
{% 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 %}
6 changes: 2 additions & 4 deletions benefits/eligibility/templates/eligibility/unverified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@

{% block paragraphs %}
<p>
{% 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 %}
{% 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 %}
</p>
{% include "core/includes/agency-links.html" %}
{% endblock paragraphs %}
Expand Down
14 changes: 7 additions & 7 deletions benefits/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
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: 2024-12-09 13:27-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"
Expand Down Expand Up @@ -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 "
Expand All @@ -697,6 +691,12 @@ msgstr ""
msgid "Unable to confirm eligibility"
msgstr ""

msgid "Your card information may not have been entered correctly."
msgstr ""

msgid "Try again"
msgstr ""

msgid "Your eligibility could not be verified."
msgstr ""

Expand Down
18 changes: 9 additions & 9 deletions benefits/locale/es/LC_MESSAGES/django.po
View file
Open in desktop
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: 2024-12-09 13:27-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"
Expand Down Expand Up @@ -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 "
Expand All @@ -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 "
Expand All @@ -893,6 +885,14 @@ msgstr ""
msgid "Unable to confirm eligibility"
msgstr "No se pudo confirmar la elegibilidad"

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 "Try again"
msgstr "Inténtelo de nuevo"

msgid "Your eligibility could not be verified."
msgstr "No se pudo verificar su elegibilidad."

Expand Down
Loading