From 2d6b985be2591b5f86a8a61599464b42d8874987 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Thu, 18 Apr 2024 20:57:43 +0000 Subject: [PATCH 1/3] chore(500): update headline, body copy --- benefits/locale/en/LC_MESSAGES/django.po | 10 +++++++++- benefits/locale/es/LC_MESSAGES/django.po | 10 +++++++++- benefits/templates/500.html | 6 ++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index effb1d1518..eb4073c0de 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-04-16 10:32-0700\n" +"POT-Creation-Date: 2024-04-18 13:56-0700\n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -663,3 +663,11 @@ msgid "" "The page you are looking for might be somewhere else or may not exist " "anymore." msgstr "" + +msgid "We’re working on fixing a problem." +msgstr "" + +msgid "" +"There is a problem with the Benefits application, and we’re working to fix " +"it. Please try again in a little while." +msgstr "" diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index 0b21b26a8e..5e1f769a1e 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: 2024-04-16 10:32-0700\n" +"POT-Creation-Date: 2024-04-18 13:56-0700\n" "Language: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -799,3 +799,11 @@ msgid "" msgstr "" "La página que está buscando puede estar en otro lugar o puede que ya no " "exista." + +msgid "We’re working on fixing a problem." +msgstr "" + +msgid "" +"There is a problem with the Benefits application, and we’re working to fix " +"it. Please try again in a little while." +msgstr "" diff --git a/benefits/templates/500.html b/benefits/templates/500.html index 32060fc02d..f1e2805e45 100644 --- a/benefits/templates/500.html +++ b/benefits/templates/500.html @@ -6,9 +6,11 @@ {% endblock title %} {% block headline %} - {% translate "Sorry! Service for this site is down." %} + {% translate "We’re working on fixing a problem." %} {% endblock headline %} {% block paragraphs %} -

{% translate "We should be back in operation soon. Please refresh the page in a few minutes." %}

+

+ {% translate "There is a problem with the Benefits application, and we’re working to fix it. Please try again in a little while." %} +

{% endblock paragraphs %} From a1aaf488bb9dc26c6d8b6b6a7aa081e34a93e030 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Thu, 18 Apr 2024 21:03:00 +0000 Subject: [PATCH 2/3] chore(copy): change home button to sentence case --- benefits/core/templates/core/includes/button--index.html | 2 +- benefits/core/templates/core/includes/button--origin.html | 2 +- benefits/core/templates/core/includes/nocookies.html | 2 +- benefits/core/templates/core/includes/noscript.html | 2 +- benefits/locale/en/LC_MESSAGES/django.po | 4 ++-- benefits/locale/es/LC_MESSAGES/django.po | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/benefits/core/templates/core/includes/button--index.html b/benefits/core/templates/core/includes/button--index.html index feab8ccc65..cbad5a8568 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 default_button_text %} +{% translate "Return home" as default_button_text %} {{ button_text | default:default_button_text }} diff --git a/benefits/core/templates/core/includes/button--origin.html b/benefits/core/templates/core/includes/button--origin.html index dab183ae4a..d7d08068f2 100644 --- a/benefits/core/templates/core/includes/button--origin.html +++ b/benefits/core/templates/core/includes/button--origin.html @@ -1,5 +1,5 @@ {% load i18n %} -{% translate "Return Home" as default_button_text %} +{% translate "Return home" as default_button_text %} {{ button_text | default:default_button_text }} diff --git a/benefits/core/templates/core/includes/nocookies.html b/benefits/core/templates/core/includes/nocookies.html index aaaf52b280..8df1484f08 100644 --- a/benefits/core/templates/core/includes/nocookies.html +++ b/benefits/core/templates/core/includes/nocookies.html @@ -6,7 +6,7 @@ {% translate "Cookies are disabled" %} {% translate "To function properly, this website requires a browser that supports cookies. Please enable cookies for this website and" %} - {% translate "Return Home" %}. + {% translate "Return home" %}. {% endblock content %} diff --git a/benefits/core/templates/core/includes/noscript.html b/benefits/core/templates/core/includes/noscript.html index cf80349a03..69405e5f56 100644 --- a/benefits/core/templates/core/includes/noscript.html +++ b/benefits/core/templates/core/includes/noscript.html @@ -6,7 +6,7 @@ {% translate "JavaScript is disabled" %} {% translate "To function properly, this website requires a browser that supports JavaScript. Please enable JavaScript for this website and" %} - {% translate "Return Home" %}. + {% translate "Return home" %}. {% endblock content %} diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index eb4073c0de..0c649a26ab 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-04-18 13:56-0700\n" +"POT-Creation-Date: 2024-04-18 14:01-0700\n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -177,7 +177,7 @@ msgstr "" msgid "Go Back" msgstr "" -msgid "Return Home" +msgid "Return home" msgstr "" msgid "Previous Page" diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index 5e1f769a1e..a4e845b10a 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: 2024-04-18 13:56-0700\n" +"POT-Creation-Date: 2024-04-18 14:01-0700\n" "Language: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -239,7 +239,7 @@ msgstr "" msgid "Go Back" msgstr "Volver" -msgid "Return Home" +msgid "Return home" msgstr "Volver al inicio" msgid "Previous Page" From e163643650c077cb49d1a84a4ad88dabcdc2a1f9 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Thu, 18 Apr 2024 21:14:59 +0000 Subject: [PATCH 3/3] fix(error): 24px between icon and headline --- benefits/templates/error.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/benefits/templates/error.html b/benefits/templates/error.html index 7ef2a42a1b..4ec55f37b9 100644 --- a/benefits/templates/error.html +++ b/benefits/templates/error.html @@ -9,9 +9,7 @@ {% block main-content %}

- - {% include "core/includes/icon.html" with name="sadbus" %} - + {% include "core/includes/icon.html" with name="sadbus" %} {% block headline %} {% endblock headline %}