From 32b84cc255a7e46671bec5e839c07cdcdbd5096f Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sun, 3 May 2020 11:38:56 +0200
Subject: [PATCH] Update error templates and move admins list to separate
 snippet

---
 aleksis/core/templates/403.html              | 11 ++---------
 aleksis/core/templates/404.html              | 11 ++---------
 aleksis/core/templates/500.html              |  7 ++++---
 aleksis/core/templates/503.html              | 11 ++---------
 aleksis/core/templates/core/admins_list.html |  8 ++++++++
 aleksis/core/templates/offline.html          |  9 +--------
 6 files changed, 19 insertions(+), 38 deletions(-)
 create mode 100644 aleksis/core/templates/core/admins_list.html

diff --git a/aleksis/core/templates/403.html b/aleksis/core/templates/403.html
index a07e7da7b..c84e7f57e 100644
--- a/aleksis/core/templates/403.html
+++ b/aleksis/core/templates/403.html
@@ -7,7 +7,7 @@
     <div class="card red">
       <div class="card white-text">
         <i class="material-icons small">error_outline</i>
-        <span class="card-title">{% blocktrans %}Error (403): You are not allowed to access the requested page or
+        <span class="card-title">{% trans "Error" %} (403): {% blocktrans %}You are not allowed to access the requested page or
           object.{% endblocktrans %}</span>
         <p>
           {% blocktrans %}
@@ -15,14 +15,7 @@
             administrators:
           {% endblocktrans %}
         </p>
-        <ul>
-          {% for admin in ADMINS %}
-            <li>
-              {{ admin.0 }}
-              &lt;<a class="blue-text text-lighten-2" href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>&gt;
-            </li>
-          {% endfor %}
-        </ul>
+        {% include "core/admins_list.html" %}
       </div>
     </div>
   </div>
diff --git a/aleksis/core/templates/404.html b/aleksis/core/templates/404.html
index 9b9d7e119..45873cde0 100644
--- a/aleksis/core/templates/404.html
+++ b/aleksis/core/templates/404.html
@@ -7,7 +7,7 @@
     <div class="card red">
       <div class="card-content white-text">
         <i class="material-icons small left">error_outline</i>
-        <span class="card-title">{% blocktrans %}Error (404): The requested page or object was not
+        <span class="card-title">{% trans "Error" %} (404): {% blocktrans %}The requested page or object was not
           found.{% endblocktrans %}</span>
         <p>
           {% blocktrans %}
@@ -19,14 +19,7 @@
             administrators:
           {% endblocktrans %}
         </p>
-        <ul>
-          {% for admin in ADMINS %}
-            <li>
-              {{ admin.0 }}
-              &lt;<a class="blue-text text-lighten-2" href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>&gt;
-            </li>
-          {% endfor %}
-        </ul>
+        {% include "core/admins_list.html" %}
       </div>
     </div>
   </div>
diff --git a/aleksis/core/templates/500.html b/aleksis/core/templates/500.html
index 96c6d882d..621b9e424 100644
--- a/aleksis/core/templates/500.html
+++ b/aleksis/core/templates/500.html
@@ -7,14 +7,15 @@
     <div class="card red">
       <div class="card-content white-text">
         <div class="material-icons small">error_outline</div>
-        <span class="card-title">{% blocktrans %}Error (500): An unexpected error has
-          occured..{% endblocktrans %}</span>
+        <span class="card-title">{% trans "Error" %} (500): {% blocktrans %}An unexpected error has
+          occured.{% endblocktrans %}</span>
         <p>
           {% blocktrans %}
             Your site administrators will automatically be notified about this
-            error.
+            error. You can also contact them directly:
           {% endblocktrans %}
         </p>
+        {% include "core/admins_list.html" %}
       </div>
     </div>
   </div>
diff --git a/aleksis/core/templates/503.html b/aleksis/core/templates/503.html
index 1df710ced..9ed4fcecb 100644
--- a/aleksis/core/templates/503.html
+++ b/aleksis/core/templates/503.html
@@ -11,17 +11,10 @@
           later.{% endblocktrans %}</span>
         <p>
           {% blocktrans %}
-            This page is currently unavailable. If this error stays, contact your site administrators:
+            This page is currently unavailable. If this error persists, contact your site administrators:
           {% endblocktrans %}
         </p>
-        <ul>
-          {% for admin in ADMINS %}
-            <li>
-              {{ admin.0 }}
-              &lt;<a class="blue-text text-lighten-2" href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>&gt;
-            </li>
-          {% endfor %}
-        </ul>
+        {% include "core/admins_list.html" %}
       </div>
     </div>
   </div>
diff --git a/aleksis/core/templates/core/admins_list.html b/aleksis/core/templates/core/admins_list.html
new file mode 100644
index 000000000..99de17243
--- /dev/null
+++ b/aleksis/core/templates/core/admins_list.html
@@ -0,0 +1,8 @@
+<ul>
+  {% for admin in ADMINS %}
+    <li>
+      {{ admin.0 }}
+      &lt;<a class="blue-text text-lighten-2" href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>&gt;
+    </li>
+  {% endfor %}
+</ul>
diff --git a/aleksis/core/templates/offline.html b/aleksis/core/templates/offline.html
index f43a012b4..6961e03de 100644
--- a/aleksis/core/templates/offline.html
+++ b/aleksis/core/templates/offline.html
@@ -12,13 +12,6 @@
       or mobile data is turned on and try again. If you think you are connected, please contact the system
       administrators:
     {% endblocktrans %}
-  <ul>
-    {% for admin in ADMINS %}
-      <li>
-        {{ admin.0 }}
-        &lt;<a href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>&gt;
-      </li>
-    {% endfor %}
-  </ul>
   </p>
+  {% include "core/admins_list.html" %}
 {% endblock %}
-- 
GitLab