chore: merge feature branch

cal-itp · Jan 3, 2025 · 69b7cc8 · 69b7cc8
2 parents dce769c + 1561cb5
commit 69b7cc8
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 50 deletions.
diff --git 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-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 %}
diff --git 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-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 %}
diff --git 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-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 %}
diff --git a/benefits/eligibility/templates/eligibility/unverified-error-agency-base.html 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 %}
+  <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--origin.html" with button_text=button_text %}
+{% endblock call-to-action-button %}
diff --git a/benefits/eligibility/templates/eligibility/unverified.html b/benefits/eligibility/templates/eligibility/unverified.html
@@ -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 %}

diff --git 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-11 12:16-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"
@@ -678,18 +678,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 "
@@ -705,6 +699,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 ""
 

diff --git 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-11 12:16-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"
@@ -868,11 +868,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 "
@@ -882,9 +877,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 "
@@ -906,6 +898,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."