From 28eb2cb949a086caf483c812f2b730465e419bff Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Mon, 26 Dec 2022 00:13:53 +0100
Subject: [PATCH] Fix Django 2.2 compatibility

---
 photo21/templates/index.html                  | 20 +++++++++----------
 .../photologue/photo_confirm_delete.html      |  4 ++--
 .../photologue/photo_confirm_report.html      |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/photo21/templates/index.html b/photo21/templates/index.html
index 16e2c1b..b7fa2e9 100644
--- a/photo21/templates/index.html
+++ b/photo21/templates/index.html
@@ -10,33 +10,33 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% block content %}
     <h2>{% trans "Welcome to the pictures server!" %}</h2>
     <p>
-        {% blocktranslate trimmed %}
+        {% blocktrans trimmed %}
         This website aims to collect the pictures and movies taken in the student
         life of ENS Paris-Saclay or involving its students.
-        {% endblocktranslate %}
+        {% endblocktrans %}
     </p>
     <p>
         {% url 'photologue:pl-gallery-archive' as gallery_archive_url %}
-        {% blocktranslate trimmed %}
+        {% blocktrans trimmed %}
         The pictures are visible in <a href="{{ gallery_archive_url }}">the galleries</a>
         and are downloadable.
         <b>However, the agreement of the photographer and the persons present
         on the photo is necessary before any republication on another platform. </b>
-        {% endblocktranslate %}
+        {% endblocktrans %}
     </p>
 
     <p>
-        {% blocktranslate trimmed %}
+        {% blocktrans trimmed %}
         If you want a photo to be deleted, please let us know:
         <a href="mailto:photos@crans.org?subject=[ABUS] Nouvelle requête" class="btn btn-secondary btn-sm">Abuse request</a>
-        {% endblocktranslate %}
+        {% endblocktrans %}
     </p>
     {% if not perms.photologue.add_photo %}
     <p>
-        {% blocktranslate trimmed %}
+        {% blocktrans trimmed %}
         If you want to obtain the right to upload pictures, please let us know:
         <a href="mailto:photos@crans.org?subject=[Photographe] Demande de droits photographe" class="btn btn-secondary btn-sm">Become a photograph</a>
-        {% endblocktranslate %}
+        {% endblocktrans %}
     </p>
     {% endif %}
 
@@ -51,14 +51,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
     <h3 class="mt-4">{% trans "Behind the scene" %}</h3>
     <p>
-        {% blocktranslate trimmed %}
+        {% blocktrans trimmed %}
         Because we value your privacy, we do not sell the data on this site,
         unlike many free online platforms.
         The dedicated server running this website is kindly hosted by the
         <a href="https://www.crans.org/">Crans</a> at the ENS Paris-Saclay
         basement.
         It is not managed by the Crans. Current active administrators are:
-        {% endblocktranslate %}
+        {% endblocktrans %}
         {% for user in superusers %} <code>{{ user.username }}</code>{% endfor %}.
         {% trans "They should be contacted at" %}
         <a href="mailto:photos@crans.org">photos@crans.org</a>.
diff --git a/photologue/templates/photologue/photo_confirm_delete.html b/photologue/templates/photologue/photo_confirm_delete.html
index dfab897..d43003a 100644
--- a/photologue/templates/photologue/photo_confirm_delete.html
+++ b/photologue/templates/photologue/photo_confirm_delete.html
@@ -14,9 +14,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
         <h1>{% trans "Delete confirmation" %}</h1>
         <form method="post">{% csrf_token %}
             <p>
-                {% blocktranslate trimmed %}
+                {% blocktrans trimmed %}
                 Are you sure you want to delete <code>{{ object }}</code>?
-                {% endblocktranslate %}
+                {% endblocktrans %}
             </p>
             {{ form }}
             <input type="submit" class="btn btn-danger" value="{% trans "Confirm" %}">
diff --git a/photologue/templates/photologue/photo_confirm_report.html b/photologue/templates/photologue/photo_confirm_report.html
index a151dda..979c7de 100644
--- a/photologue/templates/photologue/photo_confirm_report.html
+++ b/photologue/templates/photologue/photo_confirm_report.html
@@ -14,10 +14,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
         <h1>{% trans "Report confirmation" %}</h1>
         <form method="post">{% csrf_token %}
             <p>
-                {% blocktranslate trimmed %}
+                {% blocktrans trimmed %}
                 Are you sure you want to report <code>{{ object }}</code>?
                 This photo will no longer be public, and administrators will be notified.
-                {% endblocktranslate %}
+                {% endblocktrans %}
             </p>
             <input type="submit" class="btn btn-warning" value="{% trans "Confirm" %}">
         </form>