Refactor: Eligibility unverified page (#1531)

benefits/core/migrations/0001_initial.py

@@ -59,8 +59,6 @@ class Migration(migrations.Migration):
                 ("form_name_help_text", models.TextField(null=True)),
                 ("form_name_placeholder", models.TextField(null=True)),
                 ("form_name_max_length", models.PositiveSmallIntegerField(null=True)),
-                ("unverified_title", models.TextField()),
-                ("unverified_blurb", models.TextField()),
                 (
                     "auth_provider",
                     models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to="core.authprovider"),

benefits/core/migrations/0002_data.py

@@ -154,8 +154,6 @@ def load_data(app, *args, **kwargs):
         auth_provider=senior_auth_provider,
         selection_label_template="eligibility/includes/selection-label--senior.html",
         start_template="eligibility/start--senior.html",
-        unverified_title=_("eligibility.pages.unverified.title"),
-        unverified_blurb=_("eligibility.pages.unverified.p[0]"),
     )
 
     mst_veteran_verifier = EligibilityVerifier.objects.create(
@@ -164,8 +162,6 @@ def load_data(app, *args, **kwargs):
         auth_provider=veteran_auth_provider,
         selection_label_template="eligibility/includes/selection-label--veteran.html",
         start_template="eligibility/start--veteran.html",
-        unverified_title=_("eligibility.pages.unverified.title"),
-        unverified_blurb=_("eligibility.pages.unverified.p[0]"),
     )
 
     mst_courtesy_card_verifier = EligibilityVerifier.objects.create(
@@ -194,8 +190,6 @@ def load_data(app, *args, **kwargs):
         form_name_help_text=_("eligibility.forms.confirm.mst_courtesy_card.fields.name.help_text"),
         form_name_placeholder="Garcia",
         form_name_max_length=255,
-        unverified_title=_("eligibility.pages.unverified.mst_courtesy_card.title"),
-        unverified_blurb=_("eligibility.pages.unverified.mst_courtesy_card.p[0]"),
     )
 
     sacrt_oauth_claims_verifier = EligibilityVerifier.objects.create(
@@ -204,8 +198,6 @@ def load_data(app, *args, **kwargs):
         auth_provider=senior_auth_provider,
         selection_label_template="eligibility/includes/selection-label--senior.html",
         start_template="eligibility/start--senior.html",
-        unverified_title=_("eligibility.pages.unverified.title"),
-        unverified_blurb=_("eligibility.pages.unverified.p[0]"),
     )
 
     PaymentProcessor = app.get_model("core", "PaymentProcessor")

benefits/core/models.py

@@ -128,8 +128,6 @@ class EligibilityVerifier(models.Model):
     form_name_placeholder = models.TextField(null=True)
     # The maximum length accepted for the 'name' API field before sending to this verifier
     form_name_max_length = models.PositiveSmallIntegerField(null=True)
-    unverified_title = models.TextField()
-    unverified_blurb = models.TextField()
 
     def __str__(self):
         return self.name

benefits/eligibility/templates/eligibility/unverified.html

@@ -1,16 +1,25 @@
 {% extends "core/base.html" %}
+{% load i18n %}
+
+{% block page-title %}
+  {% translate "eligibility.pages.unverified.title" %} | 
+{% endblock page-title %}
 
 {% block main-content %}
   {% if authentication and authentication.sign_out_link_template %}
     {% include authentication.sign_out_link_template %}
   {% endif %}
 
   <div class="container">
-    {% include "core/includes/icon-title.html" with title=page.headline icon=page.icon %}
+    {% translate "eligibility.pages.unverified.headline" as headline %}
+    {% include "core/includes/icon-title.html" with title=headline icon=page.icon %}
 
     <div class="row justify-content-center">
       <div class="col-lg-8 pt-4">
-        {% for p in page.paragraphs %}<p>{{ p }}</p>{% endfor %}
+        <p>
+          {% translate "eligibility.pages.unverified.p[0]s[0]" %}
+          {% blocktranslate with short_name=agency.short_name %}eligibility.pages.unverified.p[0]s[1]{{ short_name }}{% endblocktranslate %}
+        </p>
       </div>
     </div>
 

benefits/eligibility/views.py

@@ -182,10 +182,7 @@ def unverified(request):
     analytics.returned_fail(request, types_to_verify)
 
     page = viewmodels.Page(
-        title=_(verifier.unverified_title),
-        headline=_("eligibility.pages.unverified.headline"),
         icon=viewmodels.Icon("idcardquestion", pgettext("image alt text", "core.icons.idcardquestion")),
-        paragraphs=[_(verifier.unverified_blurb)],
     )
 
     ctx = page.context_dict()

benefits/locale/en/LC_MESSAGES/django.po

@@ -6,21 +6,13 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-07-14 05:24+0000\n"
+"POT-Creation-Date: 2023-07-14 21:06+0000\n"
 "Language: English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "eligibility.pages.unverified.title"
-msgstr "Eligibility Error"
-
-msgid "eligibility.pages.unverified.p[0]"
-msgstr ""
-"That’s okay! You may still be eligible for our program. Please reach out to "
-"your local transit provider for assistance."
-
 msgid "eligibility.pages.confirm.mst_courtesy_card.title"
 msgstr "Confirm your Courtesy Card"
 
@@ -44,14 +36,6 @@ msgstr "[Identity-Marker] (as it appears on [Agency-Card])"
 msgid "eligibility.forms.confirm.mst_courtesy_card.fields.name.help_text"
 msgstr "We use this to help confirm your [Agency-Card]."
 
-msgid "eligibility.pages.unverified.mst_courtesy_card.title"
-msgstr "Courtesy Card not located"
-
-msgid "eligibility.pages.unverified.mst_courtesy_card.p[0]"
-msgstr ""
-"That’s okay! You may still be eligible for our program. Please reach out to "
-"Monterey-Salinas Transit for assistance."
-
 msgid "agency.variables.mst.transit_type"
 msgstr "bus"
 
@@ -571,9 +555,19 @@ msgstr "Continue to VA.gov"
 msgid "eligibility.pages.start.sub_headline"
 msgstr "You will need a few items to continue:"
 
+msgid "eligibility.pages.unverified.title"
+msgstr "Eligibility Error"
+
 msgid "eligibility.pages.unverified.headline"
 msgstr "Your eligibility could not be verified."
 
+msgid "eligibility.pages.unverified.p[0]s[0]"
+msgstr "That’s okay! You may still be eligible for our program."
+
+#, python-format
+msgid "eligibility.pages.unverified.p[0]s[1]%(short_name)s"
+msgstr "Please reach out to %(short_name)s for assistance."
+
 msgctxt "image alt text"
 msgid "core.icons.idcardquestion"
 msgstr "Identification card icon with question mark"

benefits/locale/es/LC_MESSAGES/django.po

@@ -6,21 +6,13 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-07-14 05:24+0000\n"
+"POT-Creation-Date: 2023-07-14 21:06+0000\n"
 "Language: Español\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "eligibility.pages.unverified.title"
-msgstr "Error de elegibilidad"
-
-msgid "eligibility.pages.unverified.p[0]"
-msgstr ""
-"¡Esta bien! Aún puede ser elegible para nuestro programa. Comuníquese con su "
-"proveedor de tránsito local para obtener asistencia."
-
 msgid "eligibility.pages.confirm.mst_courtesy_card.title"
 msgstr "Confirmar su eligibilidad"
 
@@ -44,14 +36,6 @@ msgstr "[Identity-Marker] (as it appears on [Agency-Card])"
 msgid "eligibility.forms.confirm.mst_courtesy_card.fields.name.help_text"
 msgstr "Usamos esto para ayudar a confirmar su [Agency-Card]."
 
-msgid "eligibility.pages.unverified.mst_courtesy_card.title"
-msgstr "Tarjeta de Cortesía de MST no confirmada"
-
-msgid "eligibility.pages.unverified.mst_courtesy_card.p[0]"
-msgstr ""
-"¡Esta bien! Aún puede ser elegible para nuestro programa. Comuníquese con "
-"Monterey-Salinas Transit para obtener asistencia."
-
 msgid "agency.variables.mst.transit_type"
 msgstr "TODO: bus"
 
@@ -583,9 +567,19 @@ msgstr "TODO: Continue with VA.gov"
 msgid "eligibility.pages.start.sub_headline"
 msgstr "TODO: Necesitará algunos artículos para conectar su beneficio:"
 
+msgid "eligibility.pages.unverified.title"
+msgstr "Error de elegibilidad"
+
 msgid "eligibility.pages.unverified.headline"
 msgstr "No se pudo verificar su elegibilidad."
 
+msgid "eligibility.pages.unverified.p[0]s[0]"
+msgstr "TODO: ¡Esta bien! Aún puede ser elegible para nuestro programa."
+
+#, python-format
+msgid "eligibility.pages.unverified.p[0]s[1]%(short_name)s"
+msgstr "TODO: Comuníquese con %(short_name)s para obtener asistencia."
+
 msgctxt "image alt text"
 msgid "core.icons.idcardquestion"
 msgstr "Icono de tarjeta de identificación con signo de interrogación"

tests/pytest/conftest.py

@@ -120,8 +120,6 @@ def model_EligibilityVerifier(model_PemData, model_EligibilityType):
         form_name_label="Name",
         form_name_help_text="Name Help Text",
         form_name_placeholder="Name",
-        unverified_title="Unverified",
-        unverified_blurb="Unverified Blurb",
     )
 
     return verifier