From f08e874539a92ba33654f47b6dab8eb519f8ea9c Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Mon, 14 Aug 2023 22:41:20 +0000 Subject: [PATCH 1/3] fix(eligibility): unverified takes user to index allow a correction of either agency or eligibility type --- benefits/core/templates/core/includes/button--index.html | 6 ++++++ benefits/eligibility/templates/eligibility/unverified.html | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 benefits/core/templates/core/includes/button--index.html diff --git a/benefits/core/templates/core/includes/button--index.html b/benefits/core/templates/core/includes/button--index.html new file mode 100644 index 000000000..bacc5d42f --- /dev/null +++ b/benefits/core/templates/core/includes/button--index.html @@ -0,0 +1,6 @@ +{% load i18n %} + +{% url "core:index" as href %} +{% translate "Return Home" as text %} + +{{ text }} diff --git a/benefits/eligibility/templates/eligibility/unverified.html b/benefits/eligibility/templates/eligibility/unverified.html index 35b5a3908..884e719c5 100644 --- a/benefits/eligibility/templates/eligibility/unverified.html +++ b/benefits/eligibility/templates/eligibility/unverified.html @@ -33,7 +33,7 @@

-
{% include "core/includes/button--origin.html" %}
+
{% include "core/includes/button--index.html" %}
From 739d0f3f5b0b5d8032d600eaaa9f1b6c1473242c Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Tue, 15 Aug 2023 05:57:49 +0000 Subject: [PATCH 2/3] fix(200-user-error): use index button, override text --- benefits/core/templates/core/includes/button--index.html | 4 ++-- benefits/locale/en/LC_MESSAGES/django.po | 5 ++++- benefits/locale/es/LC_MESSAGES/django.po | 5 ++++- benefits/templates/200-user-error.html | 5 +++++ benefits/templates/error.html | 6 +++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/benefits/core/templates/core/includes/button--index.html b/benefits/core/templates/core/includes/button--index.html index bacc5d42f..feab8ccc6 100644 --- a/benefits/core/templates/core/includes/button--index.html +++ b/benefits/core/templates/core/includes/button--index.html @@ -1,6 +1,6 @@ {% load i18n %} {% url "core:index" as href %} -{% translate "Return Home" as text %} +{% translate "Return Home" as default_button_text %} -{{ text }} +{{ button_text | default:default_button_text }} diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index 09d99a6a8..5b5ecef08 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: 2023-08-14 21:37+0000\n" +"POT-Creation-Date: 2023-08-15 05:58+0000\n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -570,6 +570,9 @@ msgid "" "will be directed to the beginning of the enrollment process." msgstr "" +msgid "Start Here" +msgstr "" + msgid "Service is down." msgstr "" diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index 09dc9b93c..2f464cfbf 100644 --- a/benefits/locale/es/LC_MESSAGES/django.po +++ b/benefits/locale/es/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: 2023-08-14 21:37+0000\n" +"POT-Creation-Date: 2023-08-15 05:58+0000\n" "Language: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -699,6 +699,9 @@ msgstr "" "Para comenzar con Cal-ITP Benefits haga clic en el botón de abajo y será " "dirigido al comienzo del proceso de inscripción." +msgid "Start Here" +msgstr "Comenzar aquí" + msgid "Service is down." msgstr "El servicio está inactivo" diff --git a/benefits/templates/200-user-error.html b/benefits/templates/200-user-error.html index 788b7b986..0121b2cce 100644 --- a/benefits/templates/200-user-error.html +++ b/benefits/templates/200-user-error.html @@ -14,3 +14,8 @@ {% translate "To get started with Cal-ITP Benefits please click the button below, and you will be directed to the beginning of the enrollment process." %}

{% endblock paragraphs %} + +{% block button %} + {% translate "Start Here" as button_text %} + {% include "core/includes/button--index.html" with button_text=button_text %} +{% endblock button %} diff --git a/benefits/templates/error.html b/benefits/templates/error.html index c87c387f4..e9ee65eb2 100644 --- a/benefits/templates/error.html +++ b/benefits/templates/error.html @@ -25,7 +25,11 @@

-
{% include "core/includes/button--origin.html" %}
+
+ {% block button %} + {% include "core/includes/button--origin.html" %} + {% endblock button %} +
{% endblock main-content %} From b6d8417a63c39eca8159cac52fa8367f7e65a788 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Tue, 15 Aug 2023 06:06:10 +0000 Subject: [PATCH 3/3] fix(errors): small typo in titles --- benefits/locale/en/LC_MESSAGES/django.po | 4 ++-- benefits/locale/es/LC_MESSAGES/django.po | 4 ++-- benefits/templates/400.html | 2 +- benefits/templates/500.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index 5b5ecef08..9d350affb 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: 2023-08-15 05:58+0000\n" +"POT-Creation-Date: 2023-08-15 06:04+0000\n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -573,7 +573,7 @@ msgstr "" msgid "Start Here" msgstr "" -msgid "Service is down." +msgid "Service is down" msgstr "" msgid "Sorry! Service for this site is down." diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index 2f464cfbf..f88caad08 100644 --- a/benefits/locale/es/LC_MESSAGES/django.po +++ b/benefits/locale/es/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: 2023-08-15 05:58+0000\n" +"POT-Creation-Date: 2023-08-15 06:04+0000\n" "Language: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -702,7 +702,7 @@ msgstr "" msgid "Start Here" msgstr "Comenzar aquí" -msgid "Service is down." +msgid "Service is down" msgstr "El servicio está inactivo" msgid "Sorry! Service for this site is down." diff --git a/benefits/templates/400.html b/benefits/templates/400.html index 81e2f63e9..32060fc02 100644 --- a/benefits/templates/400.html +++ b/benefits/templates/400.html @@ -2,7 +2,7 @@ {% load i18n %} {% block title %} - {% translate "Service is down." %} + {% translate "Service is down" %} {% endblock title %} {% block headline %} diff --git a/benefits/templates/500.html b/benefits/templates/500.html index 81e2f63e9..32060fc02 100644 --- a/benefits/templates/500.html +++ b/benefits/templates/500.html @@ -2,7 +2,7 @@ {% load i18n %} {% block title %} - {% translate "Service is down." %} + {% translate "Service is down" %} {% endblock title %} {% block headline %}