Skip to content

Commit

Permalink
refactor(unverified): title, headline
Browse files Browse the repository at this point in the history
port the existing paragraph
  • Loading branch information
thekaveman committed Jul 13, 2023
1 parent 9c82386 commit e2286b1
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 54 deletions.
4 changes: 1 addition & 3 deletions benefits/core/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 4.2.3 on 2023-07-11 17:22
# Generated by Django 4.2.3 on 2023-07-11 23:38

from django.db import migrations, models
import django.db.models.deletion
Expand Down Expand Up @@ -58,8 +58,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"),
Expand Down
8 changes: 0 additions & 8 deletions benefits/core/migrations/0002_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,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(
Expand All @@ -163,8 +161,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(
Expand Down Expand Up @@ -193,8 +189,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(
Expand All @@ -203,8 +197,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")
Expand Down
2 changes: 0 additions & 2 deletions benefits/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,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
Expand Down
10 changes: 8 additions & 2 deletions benefits/eligibility/templates/eligibility/unverified.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
{% extends "core/base.html" %}
{% load i18n %}

{% block page-title %}
{% translate "eligibility.pages.unverified.title" %} | 
{% endblock page-title %}

{% block main-content %}
{% include "core/includes/sign-out-link.html" %}

<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]" %}</p>
</div>
</div>

Expand Down
3 changes: 0 additions & 3 deletions benefits/eligibility/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
26 changes: 9 additions & 17 deletions benefits/locale/en/LC_MESSAGES/django.po
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: 2023-07-13 23:04+0000\n"
"POT-Creation-Date: 2023-07-13 23:21+0000\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -16,14 +16,6 @@ msgstr ""
msgid "eligibility.buttons.senior.signout"
msgstr "Sign out of Login.gov"

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"

Expand All @@ -47,14 +39,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"

Expand Down Expand Up @@ -571,9 +555,17 @@ 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]"
msgstr ""
"That’s okay! You may still be eligible for our program. Please reach out to "
"your local transit provider for assistance."

msgctxt "image alt text"
msgid "core.icons.idcardquestion"
msgstr "Identification card icon with question mark"
Expand Down
26 changes: 9 additions & 17 deletions benefits/locale/es/LC_MESSAGES/django.po
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: 2023-07-13 23:04+0000\n"
"POT-Creation-Date: 2023-07-13 23:21+0000\n"
"Language: Español\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -16,14 +16,6 @@ msgstr ""
msgid "eligibility.buttons.senior.signout"
msgstr "Cierre sesión de Login.gov"

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"

Expand All @@ -47,14 +39,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"

Expand Down Expand Up @@ -583,9 +567,17 @@ 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]"
msgstr ""
"¡Esta bien! Aún puede ser elegible para nuestro programa. Comuníquese con su "
"proveedor de tránsito local para obtener asistencia."

msgctxt "image alt text"
msgid "core.icons.idcardquestion"
msgstr "Icono de tarjeta de identificación con signo de interrogación"
Expand Down
2 changes: 0 additions & 2 deletions tests/pytest/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,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
Expand Down

0 comments on commit e2286b1

Please sign in to comment.