Fix: template and msgid naming (#1533)

benefits/core/middleware.py

@@ -16,7 +16,7 @@
 
 logger = logging.getLogger(__name__)
 HEALTHCHECK_PATH = "/healthcheck"
-TEMPLATE_USER_ERROR = "200_user_error.html"
+TEMPLATE_USER_ERROR = "200-user-error.html"
 
 
 def user_error(request):

benefits/core/migrations/0002_data.py

@@ -152,7 +152,7 @@ def load_data(app, *args, **kwargs):
         eligibility_type=mst_senior_type,
         auth_provider=senior_auth_provider,
         selection_label_template="eligibility/includes/selection-label--senior.html",
-        start_template="eligibility/start__login_gov.html",
+        start_template="eligibility/start--senior.html",
         unverified_title=_("eligibility.pages.unverified.title"),
         unverified_blurb=_("eligibility.pages.unverified.p[0]"),
     )
@@ -162,7 +162,7 @@ def load_data(app, *args, **kwargs):
         eligibility_type=mst_veteran_type,
         auth_provider=veteran_auth_provider,
         selection_label_template="eligibility/includes/selection-label--veteran.html",
-        start_template="eligibility/start__veteran.html",
+        start_template="eligibility/start--veteran.html",
         unverified_title=_("eligibility.pages.unverified.title"),
         unverified_blurb=_("eligibility.pages.unverified.p[0]"),
     )
@@ -179,30 +179,30 @@ def load_data(app, *args, **kwargs):
         jws_signing_alg=os.environ.get("COURTESY_CARD_VERIFIER_JWS_SIGNING_ALG", "RS256"),
         auth_provider=None,
         selection_label_template="eligibility/includes/selection-label--mst-courtesy-card.html",
-        start_template="eligibility/start__mst_courtesy_card.html",
-        form_title=_("eligibility.pages.confirm.mst_cc.title"),
-        form_headline=_("eligibility.pages.confirm.mst_cc.headline"),
-        form_blurb=_("eligibility.pages.confirm.mst_cc.p[0]"),
-        form_sub_label=_("eligibility.forms.confirm.mst_cc.fields.sub"),
-        form_sub_help_text=_("eligibility.forms.confirm.mst_cc.fields.sub.help_text"),
+        start_template="eligibility/start--mst-courtesy-card.html",
+        form_title=_("eligibility.pages.confirm.mst_courtesy_card.title"),
+        form_headline=_("eligibility.pages.confirm.mst_courtesy_card.headline"),
+        form_blurb=_("eligibility.pages.confirm.mst_courtesy_card.p[0]"),
+        form_sub_label=_("eligibility.forms.confirm.mst_courtesy_card.fields.sub"),
+        form_sub_help_text=_("eligibility.forms.confirm.mst_courtesy_card.fields.sub.help_text"),
         form_sub_placeholder="12345",
         form_sub_pattern=r"\d{5}",
         form_input_mode="numeric",
         form_max_length=5,
-        form_name_label=_("eligibility.forms.confirm.mst_cc.fields.name"),
-        form_name_help_text=_("eligibility.forms.confirm.mst_cc.fields.name.help_text"),
+        form_name_label=_("eligibility.forms.confirm.mst_courtesy_card.fields.name"),
+        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_cc.title"),
-        unverified_blurb=_("eligibility.pages.unverified.mst_cc.p[0]"),
+        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(
         name=os.environ.get("SACRT_OAUTH_VERIFIER_NAME", "OAuth claims via Login.gov (SacRT)"),
         eligibility_type=sacrt_senior_type,
         auth_provider=senior_auth_provider,
         selection_label_template="eligibility/includes/selection-label--senior.html",
-        start_template="eligibility/start__login_gov.html",
+        start_template="eligibility/start--senior.html",
         unverified_title=_("eligibility.pages.unverified.title"),
         unverified_blurb=_("eligibility.pages.unverified.p[0]"),
     )

benefits/core/templates/core/base.html

@@ -2,14 +2,14 @@
 {% load i18n %}
 {% load static %}
 {% get_current_language as LANGUAGE_CODE %}
-<!doctype html>
+<!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE }}" class="{% block classes %}{% endblock classes %}">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="description" content="{% translate "core.pages.help.about.p[0]" %}">
     {# djlint:off #}
-    <title>{% block page_title %}{% if page.title %}{{ page.title }}&nbsp;|&nbsp;{% endif %}{% endblock page_title %}{% translate "core.pages.title.suffix" %}</title>
+    <title>{% block page-title %}{% if page.title %}{{ page.title }}&nbsp;|&nbsp;{% endif %}{% endblock page-title %}{% translate "core.pages.title.suffix" %}</title>
     {# djlint:on #}
 
     <link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700" rel="stylesheet" type="text/css">
@@ -57,24 +57,16 @@
       <div id="header-container" class="navbar navbar-expand-sm navbar-dark bg-primary justify-content-between">
         <div class="container">
           <span class="navbar-brand p-0">
-            <img class="sm d-lg-none"
-                 src="{% static "img/logo-sm.svg" %}"
-                 width="90"
-                 height="51.3"
-                 alt="{% translate "core.logos.small" context "image alt text" %}"/>
-            <img class="lg d-none d-lg-block"
-                 src="{% static "img/logo-lg.svg" %}"
-                 width="220"
-                 height="50"
-                 alt="{% translate "core.logos.large" context "image alt text" %}"/>
+            <img class="sm d-lg-none" src="{% static "img/logo-sm.svg" %}" width="90" height="51.3" alt="{% translate "core.logos.small" context "image alt text" %}" />
+            <img class="lg d-none d-lg-block" src="{% static "img/logo-lg.svg" %}" width="220" height="50" alt="{% translate "core.logos.large" context "image alt text" %}" />
           </span>
           <div class="form-inline">{% include "core/includes/lang-selector.html" %}</div>
         </div>
       </div>
     </header>
 
     <main id="main-content" role="main">
-      {% block main_content %}
+      {% block main-content %}
         {% block nav-buttons %}
         {% endblock nav-buttons %}
         <div class="container main-row">
@@ -106,7 +98,7 @@ <h1>{{ page.headline }}</h1>
             </div>
           {% endblock call-to-action %}
         </div>
-      {% endblock main_content %}
+      {% endblock main-content %}
     </main>
 
     <footer id="footer">

benefits/core/templates/core/help.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 
-{% block main_content %}
+{% block main-content %}
   <div class="container">
     <div class="row justify-content-center">
       <div class="col-10">
@@ -46,8 +46,8 @@ <h2 class="pt-8" id="login-gov-verify">{% translate "core.pages.help.login_gov_v
         <p class="pt-4">{% translate "core.pages.help.login_gov_verify.p[2]" %}</p>
         <p class="pt-4">{% translate "core.pages.help.login_gov_verify.p[3]" %}</p>
 
-        <h2 class="pt-8" id="mst-courtesy-card">{% translate "core.pages.help.mst_cc" %}</h2>
-        <p class="pt-4">{% translate "core.pages.help.mst_cc.p[0]" %}</p>
+        <h2 class="pt-8" id="mst-courtesy-card">{% translate "core.pages.help.mst_courtesy_card" %}</h2>
+        <p class="pt-4">{% translate "core.pages.help.mst_courtesy_card.p[0]" %}</p>
 
         <h2 class="pt-8" id="littlepay">{% translate "core.pages.help.littlepay" %}</h2>
         <p class="pt-4">{% translate "core.pages.help.littlepay.p[0]" %}</p>
@@ -88,4 +88,4 @@ <h2 class="pt-8" id="questions">{% translate "core.pages.help.questions" %}</h2>
       </div>
     </div>
   </div>
-{% endblock main_content %}
+{% endblock main-content %}

benefits/core/templates/core/landing.html

@@ -4,7 +4,7 @@
   {{ block.super |add:" landing" }}
 {% endblock classes %}
 
-{% block main_content %}
+{% block main-content %}
   <div class="container">
     <div class="row align-items-end align-items-lg-center">
       <div class="col-lg-5">
@@ -17,4 +17,4 @@ <h2 class="p-sm pb-lg-8 pt-1 pt-lg-4 pb-4">{% translate "core.pages.landing.h2"
       </div>
     </div>
   </div>
-{% endblock main_content %}
+{% endblock main-content %}

benefits/core/templates/core/logged_out.html → benefits/core/templates/core/logged-out.html

@@ -1,7 +1,7 @@
 {% extends "core/base.html" %}
 {% load i18n %}
 
-{% block main_content %}
+{% block main-content %}
     <div class="container">
         <div class="row justify-content-lg-center">
             <h1 class="pb-lg-8 pb-5">
@@ -11,4 +11,4 @@ <h1 class="pb-lg-8 pb-5">
             {% include "core/includes/icon.html" with icon=page.icon %}
         </div>
     </div>
-{% endblock main_content %}
+{% endblock main-content %}

benefits/core/views.py

@@ -16,9 +16,9 @@
 ROUTE_LOGGED_OUT = "core:logged_out"
 
 TEMPLATE_INDEX = "core/index.html"
-TEMPLATE_AGENCY = "core/agency_index.html"
+TEMPLATE_AGENCY = "core/agency-index.html"
 TEMPLATE_HELP = "core/help.html"
-TEMPLATE_LOGGED_OUT = "core/logged_out.html"
+TEMPLATE_LOGGED_OUT = "core/logged-out.html"
 
 
 @pageview_decorator

benefits/core/widgets.py

@@ -21,8 +21,8 @@ def __init__(self, pattern=None, placeholder=None, **kwargs):
 class VerifierRadioSelect(widgets.RadioSelect):
     """A radio select input styled for the Eligibility Verifier"""
 
-    template_name = "core/widgets/verifier_radio_select.html"
-    option_template_name = "core/widgets/verifier_radio_select_option.html"
+    template_name = "core/widgets/verifier-radio-select.html"
+    option_template_name = "core/widgets/verifier-radio-select-option.html"
 
     def __init__(self, selection_label_templates=(), *args, **kwargs):
         super().__init__(*args, **kwargs)

benefits/eligibility/templates/eligibility/includes/media_item__bankcardcheck__start.html → benefits/eligibility/templates/eligibility/includes/media-item--bankcardcheck--start.html

@@ -1,9 +1,9 @@
-{% extends "core/includes/media_item.html" %}
+{% extends "core/includes/media-item.html" %}
 {% load i18n %}
 
 {% block icon %}
     {% translate "core.icons.bankcardcheck" context "image alt text" as icon_alt %}
-    {% include "core/includes/icon__direct_args.html" with name="bankcardcheck" alt=icon_alt %}
+    {% include "core/includes/icon--direct-args.html" with name="bankcardcheck" alt=icon_alt %}
 {% endblock icon %}
 
 {% block heading %}

benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--mst-courtesy-card.html

@@ -0,0 +1,13 @@
+{% extends "eligibility/includes/media-item--idcardcheck.html" %}
+
+{% load i18n %}
+
+{% block heading %}
+    {% translate "eligibility.pages.start.mst_courtesy_card.start_item.heading" %}
+{% endblock heading %}
+
+{% block body %}
+    <div class="media-body--details">
+        <p>{% translate "eligibility.pages.start.mst_courtesy_card.start_item.details" %}</p>
+    </div>
+{% endblock body %}

benefits/eligibility/templates/eligibility/includes/media_item__idcardcheck__start__login_gov.html → benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html

@@ -1,15 +1,15 @@
-{% extends "eligibility/includes/media_item__idcardcheck.html" %}
+{% extends "eligibility/includes/media-item--idcardcheck.html" %}
 
 {% load i18n %}
 
 {% block heading %}
-    {% translate "eligibility.pages.start.login_gov.start_item.heading" %}
+    {% translate "eligibility.pages.start.senior.start_item.heading" %}
 {% endblock heading %}
 
 {% block body %}
     <div class="media-body--details">
         <p>
-            {% translate "eligibility.pages.start.login_gov.start_item.details" %}
+            {% translate "eligibility.pages.start.senior.start_item.details" %}
             <!-- Button to trigger modal -->
             <button type="button" class="modal-trigger--link" data-bs-toggle="modal" data-bs-target="#identity-verification-help">
                 {% translate "eligibility.pages.start.senior.help.link_text" %}
@@ -18,9 +18,9 @@
         <div class="media-body--items">
             <p>{% translate "eligibility.pages.start.senior.start_item.secondary_details" %}</p>
             <ul>
-                <li>{% translate "eligibility.pages.start.login_gov.required_items[0]" %}</li>
-                <li>{% translate "eligibility.pages.start.login_gov.required_items[1]" %}</li>
-                <li>{% translate "eligibility.pages.start.login_gov.required_items[2]" %}</li>
+                <li>{% translate "eligibility.pages.start.senior.required_items[0]" %}</li>
+                <li>{% translate "eligibility.pages.start.senior.required_items[1]" %}</li>
+                <li>{% translate "eligibility.pages.start.senior.required_items[2]" %}</li>
             </ul>
         </div>
     </div>

benefits/eligibility/templates/eligibility/includes/media_item__idcardcheck__start__veteran.html → benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html

@@ -1,4 +1,4 @@
-{% extends "eligibility/includes/media_item__idcardcheck.html" %}
+{% extends "eligibility/includes/media-item--idcardcheck.html" %}
 
 {% load i18n %}
 

benefits/eligibility/templates/eligibility/includes/media_item__idcardcheck.html → benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck.html

@@ -1,8 +1,8 @@
-{% extends "core/includes/media_item.html" %}
+{% extends "core/includes/media-item.html" %}
 
 {% load i18n %}
 
 {% block icon %}
     {% translate "core.icons.idcardcheck" context "image alt text" as icon_alt %}
-    {% include "core/includes/icon__direct_args.html" with name="idcardcheck" alt=icon_alt %}
+    {% include "core/includes/icon--direct-args.html" with name="idcardcheck" alt=icon_alt %}
 {% endblock icon %}

benefits/eligibility/templates/eligibility/index.html

@@ -5,9 +5,9 @@
   {{ block.super | add:" eligibility-index" }}
 {% endblock classes %}
 
-{% block page_title %}
+{% block page-title %}
   {% translate "eligibility.pages.index.title" %} | 
-{% endblock page_title %}
+{% endblock page-title %}
 
 {% block nav-buttons %}
   {% url "core:index" as url %}

benefits/eligibility/templates/eligibility/start__mst_courtesy_card.html → benefits/eligibility/templates/eligibility/start--mst-courtesy-card.html

@@ -1,18 +1,18 @@
 {% extends "eligibility/start.html" %}
 {% load i18n %}
 
-{% block page_title %}
-  {% translate "eligibility.pages.start.mst_cc.title" %} | 
-{% endblock page_title %}
+{% block page-title %}
+  {% translate "eligibility.pages.start.mst_courtesy_card.title" %} | 
+{% endblock page-title %}
 
 {% block headline %}
   <div class="col-lg-10">
-    <h1>{% translate "eligibility.pages.start.mst_cc.headline" %}</h1>
+    <h1>{% translate "eligibility.pages.start.mst_courtesy_card.headline" %}</h1>
   </div>
 {% endblock headline %}
 
 {% block media-item %}
-  {% include "eligibility/includes/media_item__idcardcheck__start__mst_courtesy_card.html" %}
+  {% include "eligibility/includes/media-item--idcardcheck--start--mst-courtesy-card.html" %}
 {% endblock media-item %}
 
 {% block call-to-action-button %}

benefits/eligibility/templates/eligibility/start__login_gov.html → benefits/eligibility/templates/eligibility/start--senior.html

@@ -1,18 +1,18 @@
 {% extends "eligibility/start.html" %}
 {% load i18n %}
 
-{% block page_title %}
-  {% translate "eligibility.pages.start.login_gov.title" %} | 
-{% endblock page_title %}
+{% block page-title %}
+  {% translate "eligibility.pages.start.senior.title" %} | 
+{% endblock page-title %}
 
 {% block headline %}
   <div class="col-lg-10">
-    <h1>{% translate "eligibility.pages.start.login_gov.headline" %}</h1>
+    <h1>{% translate "eligibility.pages.start.senior.headline" %}</h1>
   </div>
 {% endblock headline %}
 
 {% block media-item %}
-  {% include "eligibility/includes/media_item__idcardcheck__start__login_gov.html" %}
+  {% include "eligibility/includes/media-item--idcardcheck--start--senior.html" %}
 {% endblock media-item %}
 
 {% block call-to-action-button %}

benefits/eligibility/templates/eligibility/start__veteran.html → benefits/eligibility/templates/eligibility/start--veteran.html

@@ -1,9 +1,9 @@
 {% extends "eligibility/start.html" %}
 {% load i18n %}
 
-{% block page_title %}
+{% block page-title %}
   {% translate "eligibility.pages.start.veteran.title" %} | 
-{% endblock page_title %}
+{% endblock page-title %}
 
 {% block headline %}
   <div class="col-lg-10">
@@ -12,7 +12,7 @@ <h1>{% translate "eligibility.pages.start.veteran.headline" %}</h1>
 {% endblock headline %}
 
 {% block media-item %}
-  {% include "eligibility/includes/media_item__idcardcheck__start__veteran.html" %}
+  {% include "eligibility/includes/media-item--idcardcheck--start--veteran.html" %}
 {% endblock media-item %}
 
 {% block call-to-action-button %}

benefits/eligibility/templates/eligibility/start.html

@@ -16,7 +16,7 @@ <h2 class="media-title p-sm">{% translate "eligibility.pages.start.sub_headline"
     <ul class="media-list mx-0 px-0 d-flex justify-content-center flex-column">
       {% block media-item %}
       {% endblock media-item %}
-      {% include "eligibility/includes/media_item__bankcardcheck__start.html" %}
+      {% include "eligibility/includes/media-item--bankcardcheck--start.html" %}
     </ul>
   </div>
 {% endblock inner-content %}

benefits/eligibility/templates/eligibility/unverified.html

@@ -1,6 +1,6 @@
 {% extends "core/base.html" %}
 
-{% block main_content %}
+{% block main-content %}
   {% include "core/includes/sign-out-link.html" %}
 
   <div class="container">
@@ -21,4 +21,4 @@
     </div>
 
   </div>
-{% endblock main_content %}
+{% endblock main-content %}