Merge branch 'release/3.5.1'

yverdon · Feb 23, 2024 · 94a68ee · 94a68ee
2 parents a58ebeb + 30d82e6
commit 94a68ee
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 10 deletions.
diff --git a/...grations/0025_alter_historicalpostfinancetransaction_authorization_timeout_on_and_more.py b/...grations/0025_alter_historicalpostfinancetransaction_authorization_timeout_on_and_more.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.9 on 2024-02-21 15:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("submissions", "0024_geom_field_input_type_for_form"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalpostfinancetransaction",
+            name="authorization_timeout_on",
+            field=models.DateTimeField(
+                null=True, verbose_name="Date de fin d'autorisation"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="postfinancetransaction",
+            name="authorization_timeout_on",
+            field=models.DateTimeField(
+                null=True, verbose_name="Date de fin d'autorisation"
+            ),
+        ),
+    ]
diff --git a/geocity/apps/submissions/payments/models.py b/geocity/apps/submissions/payments/models.py
@@ -51,7 +51,7 @@ class Transaction(models.Model):
     creation_date = models.DateTimeField(_("Date de création"), auto_now_add=True)
     updated_date = models.DateTimeField(_("Date de modification"), auto_now=True)
     authorization_timeout_on = models.DateTimeField(
-        _("Date de fin d'authorisation"), null=True
+        _("Date de fin d'autorisation"), null=True
     )
     payment_url = models.CharField(_("URL de paiement"), max_length=255, null=True)
 

diff --git a/geocity/apps/submissions/templates/submissions/emails/submission_classified_for_services.txt b/geocity/apps/submissions/templates/submissions/emails/submission_classified_for_services.txt
@@ -1,4 +1,4 @@
-{% load i18n %}{% autoescape off %}{% blocktranslate %}Bonjour {{ name }}{% endblocktranslate %},
+{% load i18n %}{% autoescape off %}{% translate "Bonjour," %}
 
 {% translate "Nous vous informons qu'une demande a été traitée et classée par le secrétariat." %}
 

diff --git a/geocity/apps/submissions/templates/submissions/emails/submission_complemented.txt b/geocity/apps/submissions/templates/submissions/emails/submission_complemented.txt
@@ -1,4 +1,4 @@
-{% load i18n %}{% autoescape off %}{% blocktranslate %}Bonjour {{ name }}{% endblocktranslate %},
+{% load i18n %}{% autoescape off %}{% translate "Bonjour," %}
 
 {% translate "La demande de compléments a été traitée." %}
 

diff --git a/...ty/apps/submissions/templates/submissions/emails/submission_prolongation_for_services.txt b/...ty/apps/submissions/templates/submissions/emails/submission_prolongation_for_services.txt
@@ -1,4 +1,4 @@
-{% load i18n %}{% autoescape off %}{% blocktranslate %}Bonjour {{ name }}{% endblocktranslate %},
+{% load i18n %}{% autoescape off %}{% translate "Bonjour," %}
 
 {% translate "Une demande de prolongation vient d'être soumise." %}
 

diff --git a/geocity/apps/submissions/templates/submissions/emails/submission_received_for_services.txt b/geocity/apps/submissions/templates/submissions/emails/submission_received_for_services.txt
@@ -1,4 +1,4 @@
-{% load i18n %}{% autoescape off %}{% blocktranslate %}Bonjour {{ name }}{% endblocktranslate %},
+{% load i18n %}{% autoescape off %}{% translate "Bonjour," %}
 
 {% translate "Nous vous informons qu'une demande/annonce a été prise en compte et classée par le secrétariat." %}
 

diff --git a/geocity/apps/submissions/templates/submissions/emails/submission_submitted.txt b/geocity/apps/submissions/templates/submissions/emails/submission_submitted.txt
@@ -1,4 +1,4 @@
-{% load i18n %}{% autoescape off %}{% blocktranslate %}Bonjour {{ name }}{% endblocktranslate %},
+{% load i18n %}{% autoescape off %}{% translate "Bonjour," %}
 
 {% translate "Une nouvelle demande/annonce vient d'être soumise." %}
 

diff --git a/geocity/apps/submissions/templates/submissions/emails/submission_submitted_with_mention.txt b/geocity/apps/submissions/templates/submissions/emails/submission_submitted_with_mention.txt
@@ -1,4 +1,4 @@
-{% load i18n %}{% autoescape off %}{% blocktranslate %}Bonjour {{ name }}{% endblocktranslate %},
+{% load i18n %}{% autoescape off %}{% translate "Bonjour," %}
 
 {% translate "Une nouvelle demande/annonce mentionnant votre service vient d'être soumise." %}
 

diff --git a/geocity/apps/submissions/templates/submissions/emails/submission_validated.txt b/geocity/apps/submissions/templates/submissions/emails/submission_validated.txt
@@ -1,4 +1,4 @@
-{% load i18n %}{% autoescape off %}{% blocktranslate %}Bonjour {{ name }}{% endblocktranslate %},
+{% load i18n %}{% autoescape off %}{% translate "Bonjour," %}
 
 {% translate "Les services chargés de la validation d'une demande ont donné leur préavis." %}
 

diff --git a/geocity/apps/submissions/templates/submissions/emails/submission_validation_reminder.txt b/geocity/apps/submissions/templates/submissions/emails/submission_validation_reminder.txt
@@ -1,4 +1,4 @@
-{% load i18n %}{% autoescape off %}{% blocktranslate %}Bonjour {{ name }}{% endblocktranslate %},
+{% load i18n %}{% autoescape off %}{% translate "Bonjour," %}
 
 {% translate "Une demande est toujours en attente de validation de votre part." %}
 

diff --git a/geocity/apps/submissions/templates/submissions/emails/submission_validation_request.txt b/geocity/apps/submissions/templates/submissions/emails/submission_validation_request.txt
@@ -1,4 +1,4 @@
-{% load i18n %}{% autoescape off %}{% blocktranslate %}Bonjour {{ name }}{% endblocktranslate %},
+{% load i18n %}{% autoescape off %}{% translate "Bonjour," %}
 
 {% translate "Une nouvelle demande est en attente de validation de votre part." %}