From d671ec7469937326a69015f4fb9c4f518917113f Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 11 Dec 2024 23:58:00 +0000 Subject: [PATCH 01/13] feat(css): change 70px to 72px above h1 --- benefits/static/css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefits/static/css/styles.css b/benefits/static/css/styles.css index e791d7009..6e43b4b2a 100644 --- a/benefits/static/css/styles.css +++ b/benefits/static/css/styles.css @@ -157,7 +157,7 @@ h4 { h1, .h1 { font-size: var(--h1-font-size); - padding-top: calc(70rem / 16); + padding-top: calc(72rem / 16); line-height: var(--heading-line-height); letter-spacing: calc(var(--h1-font-size) * var(--h1-letter-spacing-percent)); } From 5d30354a29378298b447214617b5802d222e5fdd Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 12 Dec 2024 05:14:42 +0000 Subject: [PATCH 02/13] refactor(base): refactor headline block to have col-lg-6 in it --- benefits/core/templates/core/base.html | 6 +- .../templates/eligibility/confirm.html | 4 +- .../templates/eligibility/index.html | 4 +- .../templates/eligibility/start.html | 10 +- .../enrollment/index--agency-card.html | 4 +- .../templates/enrollment/index.html | 4 +- .../templates/enrollment/success.html | 95 ++++++++++--------- 7 files changed, 60 insertions(+), 67 deletions(-) diff --git a/benefits/core/templates/core/base.html b/benefits/core/templates/core/base.html index be37c75ee..31c9a5476 100644 --- a/benefits/core/templates/core/base.html +++ b/benefits/core/templates/core/base.html @@ -73,8 +73,10 @@ {% endblock nav-buttons %}
- {% block headline %} - {% endblock headline %} +
+ {% block headline %} + {% endblock headline %} +
{% block explanatory-text-wrapper %}
diff --git a/benefits/eligibility/templates/eligibility/confirm.html b/benefits/eligibility/templates/eligibility/confirm.html index 42b2743e7..e3f947c0d 100644 --- a/benefits/eligibility/templates/eligibility/confirm.html +++ b/benefits/eligibility/templates/eligibility/confirm.html @@ -10,9 +10,7 @@ {% endblock nav-buttons %} {% block headline %} -
-

{{ form.headline }}

-
+

{{ form.headline }}

{% endblock headline %} {% block explanatory-text-wrapper %} diff --git a/benefits/eligibility/templates/eligibility/index.html b/benefits/eligibility/templates/eligibility/index.html index 428e2e8c8..89406d6f5 100644 --- a/benefits/eligibility/templates/eligibility/index.html +++ b/benefits/eligibility/templates/eligibility/index.html @@ -15,9 +15,7 @@ {% endblock nav-buttons %} {% block headline %} -
-

{% translate "Choose the transit benefit you would like to enroll in" %}

-
+

{% translate "Choose the transit benefit you would like to enroll in" %}

{% endblock headline %} {% block explanatory-text-wrapper %} diff --git a/benefits/eligibility/templates/eligibility/start.html b/benefits/eligibility/templates/eligibility/start.html index ece92563a..3c166f4d5 100644 --- a/benefits/eligibility/templates/eligibility/start.html +++ b/benefits/eligibility/templates/eligibility/start.html @@ -11,12 +11,10 @@ {% endblock nav-buttons %} {% block headline %} -
-

- {% block headline-text %} - {% endblock headline-text %} -

-
+

+ {% block headline-text %} + {% endblock headline-text %} +

{% endblock headline %} {% block inner-content %} diff --git a/benefits/enrollment/templates/enrollment/index--agency-card.html b/benefits/enrollment/templates/enrollment/index--agency-card.html index e57583ead..b0cf4ca23 100644 --- a/benefits/enrollment/templates/enrollment/index--agency-card.html +++ b/benefits/enrollment/templates/enrollment/index--agency-card.html @@ -2,7 +2,5 @@ {% load i18n %} {% block headline %} -
-

{% translate "We found your record! Now let’s enroll your contactless card." %}

-
+

{% translate "We found your record! Now let’s enroll your contactless card." %}

{% endblock headline %} diff --git a/benefits/enrollment/templates/enrollment/index.html b/benefits/enrollment/templates/enrollment/index.html index 502249192..647bc047a 100644 --- a/benefits/enrollment/templates/enrollment/index.html +++ b/benefits/enrollment/templates/enrollment/index.html @@ -12,9 +12,7 @@ {% endblock nav-buttons %} {% block headline %} -
-

{% translate "Your eligibility is confirmed! You’re almost there." %}

-
+

{% translate "Your eligibility is confirmed! You’re almost there." %}

{% endblock headline %} {% block inner-content %} diff --git a/benefits/enrollment/templates/enrollment/success.html b/benefits/enrollment/templates/enrollment/success.html index 8f9440801..fa74c1273 100644 --- a/benefits/enrollment/templates/enrollment/success.html +++ b/benefits/enrollment/templates/enrollment/success.html @@ -11,54 +11,55 @@ {% translate "Success" %} {% endblock page-title %} -{% block headline %} -
-

- {% block headline-message %} - {% blocktranslate trimmed %} - You can now use your contactless card to tap to ride with a reduced fare! - {% endblocktranslate %} - {% endblock headline-message %} -

-
-{% endblock headline %} - -{% block inner-content %} -
-
-
- {# djlint:off #} - {% if enrollment.supports_expiration %} -

{% translate "Your benefit will expire on" %} {{ enrollment.expires|date }}.

-

- {% else %} -

- {% endif %} - {% block success-message %} - {% endblock success-message %} -

- {# djlint:on #} -

- {% block thank-you-message %} - {% translate "Thank you for using Cal-ITP Benefits!" %} - {% endblock thank-you-message %} -

+{% block main-content %} +
+
+
+

+ {% block headline-message %} + {% blocktranslate trimmed %} + You can now use your contactless card to tap to ride with a reduced fare! + {% endblocktranslate %} + {% endblock headline-message %} +

-
- +
+
+
+ {# djlint:off #} + {% if enrollment.supports_expiration %} +

{% translate "Your benefit will expire on" %} {{ enrollment.expires|date }}.

+

+ {% else %} +

+ {% endif %} + {% block success-message %} + {% endblock success-message %} +

+ {# djlint:on #} +

+ {% block thank-you-message %} + {% translate "Thank you for using Cal-ITP Benefits!" %} + {% endblock thank-you-message %} +

+
+
+ +
+
+ {% if authentication and authentication.logged_in and authentication.sign_out_button_template %} +
+

+ {% translate "If you are on a public or shared computer, don’t forget to sign out of " %} + {% include authentication.sign_out_button_template %} +

+
+ {% endif %}
- {% if authentication and authentication.logged_in and authentication.sign_out_button_template %} -
-

- {% translate "If you are on a public or shared computer, don’t forget to sign out of " %} - {% include authentication.sign_out_button_template %} -

-
- {% endif %}
-{% endblock inner-content %} +{% endblock main-content %} From 94607e83bb65fbe146e8cf650272f137495c5fdb Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 12 Dec 2024 05:19:02 +0000 Subject: [PATCH 03/13] refactor(base): remove now unnecessary col-lg-8 wrapper in explanatory-text-wrapper --- benefits/core/templates/core/base.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/benefits/core/templates/core/base.html b/benefits/core/templates/core/base.html index 31c9a5476..845aa87a1 100644 --- a/benefits/core/templates/core/base.html +++ b/benefits/core/templates/core/base.html @@ -79,10 +79,8 @@
{% block explanatory-text-wrapper %} -
- {% block explanatory-text %} - {% endblock explanatory-text %} -
+ {% block explanatory-text %} + {% endblock explanatory-text %} {% endblock explanatory-text-wrapper %}
{% block inner-content %} From 59d4d8cc827bb57868faf4bc1179ac44a14c586e Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 12 Dec 2024 05:30:23 +0000 Subject: [PATCH 04/13] refactor(base): put headline, explanatory, inner-content in 1 div, all but forms are good --- benefits/core/templates/core/base.html | 14 ++++----- .../templates/eligibility/index.html | 8 ++--- .../templates/eligibility/start.html | 14 ++++----- .../templates/enrollment/index--calfresh.html | 4 +-- .../templates/enrollment/index.html | 30 +++++++++---------- 5 files changed, 30 insertions(+), 40 deletions(-) diff --git a/benefits/core/templates/core/base.html b/benefits/core/templates/core/base.html index 845aa87a1..27e711d37 100644 --- a/benefits/core/templates/core/base.html +++ b/benefits/core/templates/core/base.html @@ -76,16 +76,14 @@
{% block headline %} {% endblock headline %} + {% block explanatory-text-wrapper %} + {% block explanatory-text %} + {% endblock explanatory-text %} + {% endblock explanatory-text-wrapper %} + {% block inner-content %} + {% endblock inner-content %}
- {% block explanatory-text-wrapper %} - {% block explanatory-text %} - {% endblock explanatory-text %} - {% endblock explanatory-text-wrapper %} -
- {% block inner-content %} - {% endblock inner-content %} -
{% block call-to-action %}
diff --git a/benefits/eligibility/templates/eligibility/index.html b/benefits/eligibility/templates/eligibility/index.html index 89406d6f5..e741a79b6 100644 --- a/benefits/eligibility/templates/eligibility/index.html +++ b/benefits/eligibility/templates/eligibility/index.html @@ -19,12 +19,8 @@

{% translate "Choose the transit benefit you would like to enroll in" %}

-
- {% block explanatory-text %} - {% endblock explanatory-text %} -
-
+ {% block explanatory-text %} + {% endblock explanatory-text %} {% endblock explanatory-text-wrapper %} {% block inner-content %} diff --git a/benefits/eligibility/templates/eligibility/start.html b/benefits/eligibility/templates/eligibility/start.html index 3c166f4d5..984f1cef3 100644 --- a/benefits/eligibility/templates/eligibility/start.html +++ b/benefits/eligibility/templates/eligibility/start.html @@ -18,14 +18,12 @@

{% endblock headline %} {% block inner-content %} -
-

{% translate "You will need a few items to continue:" %}

-
    - {% block eligibility-item %} - {% endblock eligibility-item %} - {% include "eligibility/includes/eligibility-item--contactless-card--start.html" %} -
-
+

{% translate "You will need a few items to continue:" %}

+
    + {% block eligibility-item %} + {% endblock eligibility-item %} + {% include "eligibility/includes/eligibility-item--contactless-card--start.html" %} +
{% endblock inner-content %} {% block call-to-action-button %} diff --git a/benefits/enrollment/templates/enrollment/index--calfresh.html b/benefits/enrollment/templates/enrollment/index--calfresh.html index 051e7e020..becf49dcc 100644 --- a/benefits/enrollment/templates/enrollment/index--calfresh.html +++ b/benefits/enrollment/templates/enrollment/index--calfresh.html @@ -1,7 +1,7 @@ {% extends "enrollment/index.html" %} {% load i18n %} -{% block info %} +{% block paragraphs %}

{% translate "The next step is to connect your contactless card to your transit benefit" %}

@@ -13,4 +13,4 @@

{% translate "The next step is to connect your contactless c {% include "enrollment/includes/modal--littlepay.html" with id="modal--littlepay" size="modal-md" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} {% include "enrollment/includes/alert-box--warning--calfresh.html" %} -{% endblock info %} +{% endblock paragraphs %} diff --git a/benefits/enrollment/templates/enrollment/index.html b/benefits/enrollment/templates/enrollment/index.html index 647bc047a..bef519dd2 100644 --- a/benefits/enrollment/templates/enrollment/index.html +++ b/benefits/enrollment/templates/enrollment/index.html @@ -16,22 +16,20 @@

{% translate "Your eligibility is confirmed! You’re almost th {% endblock headline %} {% block inner-content %} -
- {% block info %} -

- {% translate "The next step is to enroll the contactless card you will use to tap to ride for a reduced fare." %} -

- -

- {% translate "You will be directed to our partner, " %} - Littlepay{% translate ", to enter your contactless card details." %} - {% translate "We don’t store your information, and you won’t be charged." %} -

-

{% translate "Please use a debit or credit card by Visa or Mastercard." %}

- - {% include "enrollment/includes/modal--littlepay.html" with id="modal--littlepay" size="modal-md" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} - {% endblock info %} -
+ {% block paragraphs %} +

+ {% translate "The next step is to enroll the contactless card you will use to tap to ride for a reduced fare." %} +

+ +

+ {% translate "You will be directed to our partner, " %} + Littlepay{% translate ", to enter your contactless card details." %} + {% translate "We don’t store your information, and you won’t be charged." %} +

+

{% translate "Please use a debit or credit card by Visa or Mastercard." %}

+ + {% include "enrollment/includes/modal--littlepay.html" with id="modal--littlepay" size="modal-md" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} + {% endblock paragraphs %} {% comment %} This Javascript code is partially generated by this template and so it must come before the forms, which are rendered at just before the {% endblock inner-content %} From 9fe24fa1d991f54733f9e046c3058f1d2e020f2c Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 12 Dec 2024 06:02:56 +0000 Subject: [PATCH 05/13] refactor(index): remove the term 'landing' and use base instead, like the rest --- .../core/{agency-index.html => index--agency-base.html} | 2 +- benefits/core/templates/core/index--cst.html | 2 +- benefits/core/templates/core/index--mst.html | 2 +- benefits/core/templates/core/index--nevco.html | 2 +- benefits/core/templates/core/index--sacrt.html | 2 +- benefits/core/templates/core/index--sbmtd.html | 3 +-- benefits/core/templates/core/{landing.html => index-base.html} | 0 benefits/core/templates/core/index.html | 2 +- benefits/core/views.py | 2 +- tests/pytest/conftest.py | 2 +- 10 files changed, 9 insertions(+), 10 deletions(-) rename benefits/core/templates/core/{agency-index.html => index--agency-base.html} (87%) rename benefits/core/templates/core/{landing.html => index-base.html} (100%) diff --git a/benefits/core/templates/core/agency-index.html b/benefits/core/templates/core/index--agency-base.html similarity index 87% rename from benefits/core/templates/core/agency-index.html rename to benefits/core/templates/core/index--agency-base.html index 21182660f..ac349ef58 100644 --- a/benefits/core/templates/core/agency-index.html +++ b/benefits/core/templates/core/index--agency-base.html @@ -1,4 +1,4 @@ -{% extends "core/landing.html" %} +{% extends "core/index-base.html" %} {% load i18n %} {% block title %} diff --git a/benefits/core/templates/core/index--cst.html b/benefits/core/templates/core/index--cst.html index 91c3f5628..c44930a9b 100644 --- a/benefits/core/templates/core/index--cst.html +++ b/benefits/core/templates/core/index--cst.html @@ -1,4 +1,4 @@ -{% extends "core/agency-index.html" %} +{% extends "core/index--agency-base.html" %} {% load i18n %} {% block headline %} diff --git a/benefits/core/templates/core/index--mst.html b/benefits/core/templates/core/index--mst.html index a5eaed0a4..7f76939af 100644 --- a/benefits/core/templates/core/index--mst.html +++ b/benefits/core/templates/core/index--mst.html @@ -1,4 +1,4 @@ -{% extends "core/agency-index.html" %} +{% extends "core/index--agency-base.html" %} {% load i18n %} {% block headline %} diff --git a/benefits/core/templates/core/index--nevco.html b/benefits/core/templates/core/index--nevco.html index 5490f49a3..3878f13e5 100644 --- a/benefits/core/templates/core/index--nevco.html +++ b/benefits/core/templates/core/index--nevco.html @@ -1,4 +1,4 @@ -{% extends "core/agency-index.html" %} +{% extends "core/index--agency-base.html" %} {% load i18n %} {% block headline %} diff --git a/benefits/core/templates/core/index--sacrt.html b/benefits/core/templates/core/index--sacrt.html index c4d1b5954..73292461d 100644 --- a/benefits/core/templates/core/index--sacrt.html +++ b/benefits/core/templates/core/index--sacrt.html @@ -1,4 +1,4 @@ -{% extends "core/agency-index.html" %} +{% extends "core/index--agency-base.html" %} {% load i18n %} {% block headline %} diff --git a/benefits/core/templates/core/index--sbmtd.html b/benefits/core/templates/core/index--sbmtd.html index fc53e46e1..eb4a386a3 100644 --- a/benefits/core/templates/core/index--sbmtd.html +++ b/benefits/core/templates/core/index--sbmtd.html @@ -1,5 +1,4 @@ -{% extends "core/agency-index.html" %} - +{% extends "core/index--agency-base.html" %} {% load i18n %} {% block headline %} diff --git a/benefits/core/templates/core/landing.html b/benefits/core/templates/core/index-base.html similarity index 100% rename from benefits/core/templates/core/landing.html rename to benefits/core/templates/core/index-base.html diff --git a/benefits/core/templates/core/index.html b/benefits/core/templates/core/index.html index 027744598..748762cfb 100644 --- a/benefits/core/templates/core/index.html +++ b/benefits/core/templates/core/index.html @@ -1,4 +1,4 @@ -{% extends "core/landing.html" %} +{% extends "core/index-base.html" %} {% load i18n %} {% block title %} diff --git a/benefits/core/views.py b/benefits/core/views.py index 903528978..1fe0423d1 100644 --- a/benefits/core/views.py +++ b/benefits/core/views.py @@ -12,7 +12,7 @@ from .middleware import pageview_decorator, index_or_agencyindex_origin_decorator, user_error TEMPLATE_INDEX = "core/index.html" -TEMPLATE_AGENCY = "core/agency-index.html" +TEMPLATE_AGENCY = "core/index--agency-base.html" TEMPLATE_HELP = "core/help.html" TEMPLATE_LOGGED_OUT = "core/logged-out.html" diff --git a/tests/pytest/conftest.py b/tests/pytest/conftest.py index 620622ba4..3af0afb68 100644 --- a/tests/pytest/conftest.py +++ b/tests/pytest/conftest.py @@ -175,7 +175,7 @@ def model_TransitAgency(model_PemData, model_TransitProcessor): eligibility_api_id="test123", eligibility_api_private_key=model_PemData, eligibility_api_public_key=model_PemData, - index_template_override="core/agency-index.html", + index_template_override="core/index--agency-base.html", eligibility_index_template_override="eligibility/index.html", logo_large="agencies/cst-lg.png", logo_small="agencies/cst-sm.png", From 0850faf57408f97e7e420e4e7d562b7a9b3e9dfd Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 12 Dec 2024 06:04:12 +0000 Subject: [PATCH 06/13] refactor(logged-out): use inner-content instead of main-content --- benefits/core/templates/core/logged-out.html | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/benefits/core/templates/core/logged-out.html b/benefits/core/templates/core/logged-out.html index 2e53ae63d..45b366fb0 100644 --- a/benefits/core/templates/core/logged-out.html +++ b/benefits/core/templates/core/logged-out.html @@ -5,13 +5,7 @@ {% translate "Logged out" %} {% endblock page-title %} -{% block main-content %} -
-
-
-
{% include "core/includes/icon.html" with name="happybus" %}
-

{% translate "You have successfully logged out. Thank you for using Cal-ITP Benefits!" %}

-
-
-
-{% endblock main-content %} +{% block inner-content %} +
{% include "core/includes/icon.html" with name="happybus" %}
+

{% translate "You have successfully logged out. Thank you for using Cal-ITP Benefits!" %}

+{% endblock inner-content %} From 302914262d530d9327669155255f602de82acfbe Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 12 Dec 2024 06:07:17 +0000 Subject: [PATCH 07/13] refactor(base): remove unnecessary class, col-12 --- benefits/core/templates/core/base.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/benefits/core/templates/core/base.html b/benefits/core/templates/core/base.html index 27e711d37..16e151e0b 100644 --- a/benefits/core/templates/core/base.html +++ b/benefits/core/templates/core/base.html @@ -1,4 +1,3 @@ - {% load i18n %} {% load static %} {% get_current_language as LANGUAGE_CODE %} @@ -85,8 +84,8 @@
{% block call-to-action %} -
-
+
+
{% block call-to-action-button %} {% endblock call-to-action-button %}
From 5b76baa21ac86a270a8aecbbb4a787b4b8a16be1 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 12 Dec 2024 19:13:37 +0000 Subject: [PATCH 08/13] chore: make messages --- benefits/locale/en/LC_MESSAGES/django.po | 24 +++++++++--------- benefits/locale/es/LC_MESSAGES/django.po | 32 ++++++++++++------------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index 1b40940fa..a9f6ed6b1 100644 --- a/benefits/locale/en/LC_MESSAGES/django.po +++ b/benefits/locale/en/LC_MESSAGES/django.po @@ -6,19 +6,13 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n" -"POT-Creation-Date: 2024-12-09 13:27-0800\n" +"POT-Creation-Date: 2024-12-12 11:13-0800\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 "Get started" -msgstr "" - -msgid "Get Started" -msgstr "" - msgid "" "The Benefits tool is provided by California Integrated Travel Project (Cal-" "ITP), which is a new program from the California Department of " @@ -320,6 +314,12 @@ msgid "" "JavaScript. Please enable JavaScript for this website and" msgstr "" +msgid "Get started" +msgstr "" + +msgid "Get Started" +msgstr "" + msgid "Get a reduced fare on CST public transportation when you tap to ride" msgstr "" @@ -337,19 +337,19 @@ msgstr "" msgid "Get a reduced fare on Santa Barbara MTD buses when you tap to ride" msgstr "" -msgid "Choose transit agency" +msgid "Cal-ITP Benefits connects your transit benefit to your contactless card" msgstr "" -msgid "Get a reduced fare on public transportation when you tap to ride" +msgid "A person holds a contactless debit card next to a card reader on a bus." msgstr "" -msgid "Choose your Provider" +msgid "Choose transit agency" msgstr "" -msgid "Cal-ITP Benefits connects your transit benefit to your contactless card" +msgid "Get a reduced fare on public transportation when you tap to ride" msgstr "" -msgid "A person holds a contactless debit card next to a card reader on a bus." +msgid "Choose your Provider" msgstr "" msgid "Logged out" diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index 1f40c5888..b7eab2e22 100644 --- a/benefits/locale/es/LC_MESSAGES/django.po +++ b/benefits/locale/es/LC_MESSAGES/django.po @@ -6,19 +6,13 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n" -"POT-Creation-Date: 2024-12-09 13:27-0800\n" +"POT-Creation-Date: 2024-12-12 11:13-0800\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 "Get started" -msgstr "Comenzar" - -msgid "Get Started" -msgstr "Comenzar" - msgid "" "The Benefits tool is provided by California Integrated Travel Project (Cal-" "ITP), which is a new program from the California Department of " @@ -434,6 +428,12 @@ msgstr "" "Para funcionar correctamente, este sitio web requiere un navegador que " "admita JavaScript. Por favor, active JavaScript por este sitio web y" +msgid "Get started" +msgstr "Comenzar" + +msgid "Get Started" +msgstr "Comenzar" + msgid "Get a reduced fare on CST public transportation when you tap to ride" msgstr "" "Obtenga una tarifa reducida en el transporte público CST cuando toque para " @@ -461,6 +461,15 @@ msgstr "" "Obtenga una tarifa reducida en los autobuses del Santa Barbara MTD cuando " "toque para viajar" +msgid "Cal-ITP Benefits connects your transit benefit to your contactless card" +msgstr "" +"Cal-ITP Benefits conecta su beneficio de tránsito con su tarjeta sin contacto" + +msgid "A person holds a contactless debit card next to a card reader on a bus." +msgstr "" +"Una persona sostiene una tarjeta de débito junto a un lector de tarjetas en " +"un autobús." + msgid "Choose transit agency" msgstr "Elija la agencia de tránsito" @@ -471,15 +480,6 @@ msgstr "" msgid "Choose your Provider" msgstr "Elija su Proveedor" -msgid "Cal-ITP Benefits connects your transit benefit to your contactless card" -msgstr "" -"Cal-ITP Benefits conecta su beneficio de tránsito con su tarjeta sin contacto" - -msgid "A person holds a contactless debit card next to a card reader on a bus." -msgstr "" -"Una persona sostiene una tarjeta de débito junto a un lector de tarjetas en " -"un autobús." - msgid "Logged out" msgstr "Cierre sesión" From 2c6acc92b1342e628dc7c00485c129fd23ddc021 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 17 Dec 2024 05:57:57 +0000 Subject: [PATCH 09/13] chore: make messages again --- benefits/locale/en/LC_MESSAGES/django.po | 14 +++++++------- benefits/locale/es/LC_MESSAGES/django.po | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index df1baf623..804e24fe0 100644 --- 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-16 21:57-0800\n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -314,12 +314,6 @@ msgid "" "JavaScript. Please enable JavaScript for this website and" msgstr "" -msgid "Get started" -msgstr "" - -msgid "Get Started" -msgstr "" - msgid "" "This site is protected by reCAPTCHA and the Google las Condiciones de " "servicio de Google." +msgid "Get started" +msgstr "Comenzar" + +msgid "Get Started" +msgstr "Comenzar" + msgid "Get a reduced fare on CST public transportation when you tap to ride" msgstr "" "Obtenga una tarifa reducida en el transporte público CST cuando toque para " From 0b951718c8c609ab0b7322b89211bfdf8000f78b Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 17 Dec 2024 05:59:56 +0000 Subject: [PATCH 10/13] fix(elig-confirm): remove now unnecessary parent divs --- .../eligibility/templates/eligibility/confirm.html | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/benefits/eligibility/templates/eligibility/confirm.html b/benefits/eligibility/templates/eligibility/confirm.html index f528a6812..5a58277e6 100644 --- a/benefits/eligibility/templates/eligibility/confirm.html +++ b/benefits/eligibility/templates/eligibility/confirm.html @@ -18,13 +18,9 @@

{{ form.headline }}

{% endblock headline %} {% block explanatory-text-wrapper %} -
-
- {% block explanatory-text %} -

{{ form.blurb }}

- {% endblock explanatory-text %} -
-
+ {% block explanatory-text %} +

{{ form.blurb }}

+ {% endblock explanatory-text %} {% endblock explanatory-text-wrapper %} {% block inner-content %} From 19a4860e3263285315db1707583827679f80f3a7 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 17 Dec 2024 06:00:48 +0000 Subject: [PATCH 11/13] fix(form): delete now unnecessary class --- benefits/core/templates/core/includes/form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefits/core/templates/core/includes/form.html b/benefits/core/templates/core/includes/form.html index 695d9a9aa..4ff9c81a5 100644 --- a/benefits/core/templates/core/includes/form.html +++ b/benefits/core/templates/core/includes/form.html @@ -4,7 +4,7 @@ {% url form.action_url as form_action %}
From e56bbe353214c81c42a3fadf991bc7bc6469312f Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 17 Dec 2024 06:03:31 +0000 Subject: [PATCH 12/13] refactor(elig-index): remove now unnecessary block --- benefits/eligibility/templates/eligibility/index.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/benefits/eligibility/templates/eligibility/index.html b/benefits/eligibility/templates/eligibility/index.html index 4455e1ea4..072194f4d 100644 --- a/benefits/eligibility/templates/eligibility/index.html +++ b/benefits/eligibility/templates/eligibility/index.html @@ -18,11 +18,6 @@

{% translate "Choose the transit benefit you would like to enroll in" %}

{% endblock headline %} -{% block explanatory-text-wrapper %} - {% block explanatory-text %} - {% endblock explanatory-text %} -{% endblock explanatory-text-wrapper %} - {% block inner-content %} {% include "core/includes/form.html" with form=form %}