Merge branch 'okfde:main' into main

froide/foirequest/forms/message.py

@@ -7,6 +7,7 @@
 from django import forms
 from django.conf import settings
 from django.db import transaction
+from django.template import Context, Template
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
@@ -122,17 +123,32 @@ def get_send_message_form(*args, **kwargs):
     if foirequest.is_overdue() and foirequest.awaits_response():
         days = (timezone.now() - foirequest.due_date).days + 1
         first_message = foirequest.messages[0]
-        message = render_to_string(
-            select_foirequest_template(
-                foirequest, "foirequest/emails/overdue_reply.txt"
-            ),
-            {
-                "due": ngettext_lazy("%(count)s day", "%(count)s days", days)
-                % {"count": days},
-                "foirequest": foirequest,
-                "first_message": first_message,
-            },
-        )
+
+        context = {
+            "due": ngettext_lazy("%(count)s day", "%(count)s days", days)
+            % {"count": days},
+            "foirequest": foirequest,
+            "first_message": first_message,
+        }
+
+        message = None
+
+        if foirequest.law.overdue_reply:
+            template_str = "{top}{body}{bottom}{footer}".format(
+                top="{% autoescape off %}",
+                body=foirequest.law.overdue_reply,
+                bottom="{% endautoescape %}",
+                footer='\r\n{% include "foirequest/emails/overdue_reply_footer.txt" %}',
+            )
+            message = Template(template_str).render(Context(context))
+        if not message:
+            message = render_to_string(
+                select_foirequest_template(
+                    foirequest, "foirequest/emails/overdue_reply.txt"
+                ),
+                context,
+            )
+
     else:
         message = get_default_initial_message(foirequest.user)
 

froide/foirequest/templates/foirequest/emails/overdue_reply.txt

@@ -5,6 +5,5 @@ Please update me on the status of my request as soon as possible.
 
 Sincerely yours,
 {{ name }}{% endblocktrans %}
-
-{% translate "-------- Forwarded Message --------" %}
-{{ first_message.get_quoted_message }}{% endautoescape %}
+{% endautoescape %}
+{% include "foirequest/emails/overdue_reply_footer.txt" %}

froide/foirequest/templates/foirequest/emails/overdue_reply_footer.txt

@@ -0,0 +1,4 @@
+{% load i18n %}{% autoescape off%}
+{% translate "-------- Forwarded Message --------" %}
+{{ first_message.get_quoted_message }}
+{% endautoescape %}

froide/publicbody/migrations/0046_foilawtranslation_overdue_reply.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.4 on 2024-03-04 13:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("publicbody", "0045_jurisdiction_last_modified_at"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="foilawtranslation",
+            name="overdue_reply",
+            field=models.TextField(blank=True, verbose_name="overdue reply"),
+        ),
+    ]

froide/publicbody/models.py

@@ -117,6 +117,7 @@ class FoiLaw(TranslatableModel):
         letter_start=models.TextField(_("Start of Letter"), blank=True),
         letter_end=models.TextField(_("End of Letter"), blank=True),
         refusal_reasons=models.TextField(_("refusal reasons"), blank=True),
+        overdue_reply=models.TextField(_("overdue reply"), blank=True),
     )
 
     created = models.DateField(_("Creation Date"), blank=True, null=True)