chore: rename Eligibility "start" msgids to avoid confusion with "title"

cal-itp · Sep 26, 2022 · c09ade9 · c09ade9
1 parent b70eec6
commit c09ade9
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 23 deletions.
diff --git a/benefits/core/migrations/0001_initial.py b/benefits/core/migrations/0001_initial.py
@@ -46,8 +46,8 @@ class Migration(migrations.Migration):
                 ("jws_signing_alg", models.TextField(null=True)),
                 ("selection_label", models.TextField()),
                 ("selection_label_description", models.TextField(null=True)),
-                ("start_title", models.TextField()),
-                ("start_content_title", models.TextField()),
+                ("start_headline", models.TextField()),
+                ("start_sub_headline", models.TextField()),
                 ("start_item_name", models.TextField()),
                 ("start_item_description", models.TextField()),
                 ("start_blurb", models.TextField()),

diff --git a/benefits/core/migrations/0002_sample_data.py b/benefits/core/migrations/0002_sample_data.py
@@ -107,8 +107,8 @@ def load_sample_data(app, *args, **kwargs):
         auth_provider=auth_provider,
         selection_label=_("eligibility.pages.index.dmv.label"),
         selection_label_description=None,
-        start_title=_("eligibility.pages.start.dmv.title"),
-        start_content_title=_("eligibility.pages.start.dmv.content_title"),
+        start_headline=_("eligibility.pages.start.dmv.title"),
+        start_sub_headline=_("eligibility.pages.start.dmv.content_title"),
         start_item_name=_("eligibility.pages.start.dmv.items[0].title"),
         start_item_description=_("eligibility.pages.start.dmv.items[0].text"),
         start_blurb=_("eligibility.pages.start.dmv.p[0]"),
@@ -139,8 +139,8 @@ def load_sample_data(app, *args, **kwargs):
         auth_provider=None,
         selection_label=_("eligibility.pages.index.mst.label"),
         selection_label_description=_("eligibility.pages.index.mst.description"),
-        start_title=_("eligibility.pages.start.mst.title"),
-        start_content_title=_("eligibility.pages.start.mst.content_title"),
+        start_headline=_("eligibility.pages.start.mst.headline"),
+        start_sub_headline=_("eligibility.pages.start.mst.sub_headline"),
         start_item_name=_("eligibility.pages.start.mst.items[0].title"),
         start_item_description=_("eligibility.pages.start.mst.items[0].text"),
         start_blurb=_("eligibility.pages.start.mst.p[0]"),
@@ -164,8 +164,8 @@ def load_sample_data(app, *args, **kwargs):
         auth_provider=auth_provider,
         selection_label=_("eligibility.pages.index.oauth.label"),
         selection_label_description=None,
-        start_title=_("eligibility.pages.start.oauth.title"),
-        start_content_title=_("eligibility.pages.start.oauth.content_title"),
+        start_headline=_("eligibility.pages.start.oauth.headline"),
+        start_sub_headline=_("eligibility.pages.start.oauth.sub_headline"),
         start_item_name=_("eligibility.pages.start.oauth.items[0].title"),
         start_item_description=_("eligibility.pages.start.oauth.items[0].text"),
         start_blurb=_("eligibility.pages.start.oauth.p[0]"),

diff --git a/benefits/core/models.py b/benefits/core/models.py
@@ -94,8 +94,8 @@ class EligibilityVerifier(models.Model):
     auth_provider = models.ForeignKey(AuthProvider, on_delete=models.PROTECT, null=True)
     selection_label = models.TextField()
     selection_label_description = models.TextField(null=True)
-    start_title = models.TextField()
-    start_content_title = models.TextField()
+    start_headline = models.TextField()
+    start_sub_headline = models.TextField()
     start_item_name = models.TextField()
     start_item_description = models.TextField()
     start_blurb = models.TextField()

diff --git a/benefits/eligibility/templates/eligibility/start.html b/benefits/eligibility/templates/eligibility/start.html
@@ -6,9 +6,9 @@
 
 {% block main_content %}
   <div class="container">
-    <h1 class="headline">{{ start_title }}</h1>
+    <h1 class="headline">{{ start_headline }}</h1>
 
-    <h2 class="media-title">{{ start_content_title }}</h2>
+    <h2 class="media-title">{{ start_sub_headline }}</h2>
 
     {% block media_list %}
       {% if media|length_is:"0" %}

diff --git a/benefits/eligibility/views.py b/benefits/eligibility/views.py
@@ -119,8 +119,8 @@ def start(request):
     )
 
     ctx = page.context_dict()
-    ctx["start_title"] = _(verifier.start_title)
-    ctx["start_content_title"] = _(verifier.start_content_title)
+    ctx["start_headline"] = _(verifier.start_headline)
+    ctx["start_sub_headline"] = _(verifier.start_sub_headline)
     ctx["media"] = media
 
     return TemplateResponse(request, TEMPLATE_START, ctx)

diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
@@ -94,11 +94,11 @@ msgid "eligibility.pages.index.mst.description"
 msgstr "(includes MST RIDES Paratransit Eligibility cardholders)"
 
 #: benefits/core/migrations/0002_sample_data.py:142
-msgid "eligibility.pages.start.mst.title"
+msgid "eligibility.pages.start.mst.headline"
 msgstr "You selected a Courtesy Card Benefit."
 
 #: benefits/core/migrations/0002_sample_data.py:143
-msgid "eligibility.pages.start.mst.content_title"
+msgid "eligibility.pages.start.mst.sub_headline"
 msgstr "You will need a few items to connect your benefit:"
 
 #: benefits/core/migrations/0002_sample_data.py:144
@@ -160,11 +160,11 @@ msgid "eligibility.pages.index.oauth.label"
 msgstr "Senior Discount Program"
 
 #: benefits/core/migrations/0002_sample_data.py:167
-msgid "eligibility.pages.start.oauth.title"
+msgid "eligibility.pages.start.oauth.headline"
 msgstr "You selected an Older Adult Benefit with MST."
 
 #: benefits/core/migrations/0002_sample_data.py:168
-msgid "eligibility.pages.start.oauth.content_title"
+msgid "eligibility.pages.start.oauth.sub_headline"
 msgstr "You will need a few items to connect your benefit:"
 
 #: benefits/core/migrations/0002_sample_data.py:169

diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
@@ -100,13 +100,13 @@ msgid "eligibility.pages.index.mst.description"
 msgstr "TODO: (includes MST RIDES Paratransit Eligibility cardholders)"
 
 #: benefits/core/migrations/0002_sample_data.py:142
-msgid "eligibility.pages.start.mst.title"
+msgid "eligibility.pages.start.mst.headline"
 msgstr ""
 "Conecta tu tarjeta bancaria para tu descuento en el transporte público con "
 "Cal-ITP Benefits."
 
 #: benefits/core/migrations/0002_sample_data.py:143
-msgid "eligibility.pages.start.mst.content_title"
+msgid "eligibility.pages.start.mst.sub_headline"
 msgstr "TODO: Genial, necesitarás dos cosas antes de empeza"
 
 #: benefits/core/migrations/0002_sample_data.py:144
@@ -167,13 +167,13 @@ msgid "eligibility.pages.index.oauth.label"
 msgstr "TODO: Senior Discount Program"
 
 #: benefits/core/migrations/0002_sample_data.py:167
-msgid "eligibility.pages.start.oauth.title"
+msgid "eligibility.pages.start.oauth.headline"
 msgstr ""
 "Conecta tu tarjeta bancaria para tu descuento en el transporte público con "
 "Cal-ITP Benefits."
 
 #: benefits/core/migrations/0002_sample_data.py:168
-msgid "eligibility.pages.start.oauth.content_title"
+msgid "eligibility.pages.start.oauth.sub_headline"
 msgstr "Necesitará algunos artículos para conectar su descuento:"
 
 #: benefits/core/migrations/0002_sample_data.py:169

diff --git a/tests/pytest/conftest.py b/tests/pytest/conftest.py
@@ -89,7 +89,8 @@ def model_EligibilityVerifier(model_PemData, model_EligibilityType):
         eligibility_type=model_EligibilityType,
         public_key=model_PemData,
         selection_label="Select",
-        start_content_title="Start",
+        start_headline="Start",
+        start_sub_headline="Start",
         start_item_name="Start Item",
         start_item_description="Start Item Description",
         start_blurb="Start Blurb",