Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: update 500 error page #2039

Merged
merged 3 commits into from
Apr 19, 2024
Merged

Chore: update 500 error page #2039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d6b985
chore(500): update headline, body copy
thekaveman Apr 18, 2024
a1aaf48
chore(copy): change home button to sentence case
thekaveman Apr 18, 2024
e163643
fix(error): 24px between icon and headline
thekaveman Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benefits/core/templates/core/includes/button--index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}

<a href="{{ href }}" class="btn btn-lg btn-primary">{{ button_text | default:default_button_text }}</a>
2 changes: 1 addition & 1 deletion benefits/core/templates/core/includes/button--origin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load i18n %}

{% translate "Return Home" as default_button_text %}
{% translate "Return home" as default_button_text %}

<a href="{{ origin }}" class="btn btn-lg btn-primary">{{ button_text | default:default_button_text }}</a>
2 changes: 1 addition & 1 deletion benefits/core/templates/core/includes/nocookies.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class="navbar-brand">{% translate "Cookies are disabled" %}</span>
<span class="navbar-text">
{% translate "To function properly, this website requires a browser that supports cookies. Please enable cookies for this website and" %}
<a href="{% url "core:index" %}">{% translate "Return Home" %}</a>.
<a href="{% url "core:index" %}">{% translate "Return home" %}</a>.
</span>
</div>
{% endblock content %}
2 changes: 1 addition & 1 deletion benefits/core/templates/core/includes/noscript.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class="navbar-brand">{% translate "JavaScript is disabled" %}</span>
<span class="navbar-text">
{% translate "To function properly, this website requires a browser that supports JavaScript. Please enable JavaScript for this website and" %}
<a href="{% url "core:index" %}">{% translate "Return Home" %}</a>.
<a href="{% url "core:index" %}">{% translate "Return home" %}</a>.
</span>
</div>
{% endblock content %}
12 changes: 10 additions & 2 deletions benefits/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 14:01-0700\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -177,7 +177,7 @@ msgstr ""
msgid "Go Back"
msgstr ""

msgid "Return Home"
msgid "Return home"
msgstr ""

msgid "Previous Page"
Expand Down Expand Up @@ -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 ""
12 changes: 10 additions & 2 deletions benefits/locale/es/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 14:01-0700\n"
"Language: Español\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -239,7 +239,7 @@ msgstr ""
msgid "Go Back"
msgstr "Volver"

msgid "Return Home"
msgid "Return home"
msgstr "Volver al inicio"

msgid "Previous Page"
Expand Down Expand Up @@ -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 ""
6 changes: 4 additions & 2 deletions benefits/templates/500.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
<p>{% translate "We should be back in operation soon. Please refresh the page in a few minutes." %}</p>
<p>
{% translate "There is a problem with the Benefits application, and we’re working to fix it. Please try again in a little while." %}
</p>
{% endblock paragraphs %}
4 changes: 1 addition & 3 deletions benefits/templates/error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
{% block main-content %}
<div class="container">
<h1 class="icon-title h2 text-center">
<span class="icon d-block pb-5">
{% include "core/includes/icon.html" with name="sadbus" %}
</span>
<span class="icon d-block pb-4">{% include "core/includes/icon.html" with name="sadbus" %}</span>
{% block headline %}
{% endblock headline %}
</h1>
Expand Down
Loading