From ed0a6da96f33909d4d4dfa2ce4bd59507fbf8e66 Mon Sep 17 00:00:00 2001 From: AlexandreJunod Date: Wed, 21 Feb 2024 16:56:31 +0100 Subject: [PATCH 1/2] fix typo --- ...ction_authorization_timeout_on_and_more.py | 27 +++++++++++++++++++ geocity/apps/submissions/payments/models.py | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 geocity/apps/submissions/migrations/0025_alter_historicalpostfinancetransaction_authorization_timeout_on_and_more.py diff --git a/geocity/apps/submissions/migrations/0025_alter_historicalpostfinancetransaction_authorization_timeout_on_and_more.py b/geocity/apps/submissions/migrations/0025_alter_historicalpostfinancetransaction_authorization_timeout_on_and_more.py new file mode 100644 index 000000000..3eef921dd --- /dev/null +++ b/geocity/apps/submissions/migrations/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 index 56bc0fe17..6637130c7 100644 --- 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) From 2a23c1d00fcdd5bdbd49921f62637c5b9330076e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bovard?= Date: Fri, 23 Feb 2024 15:30:40 +0100 Subject: [PATCH 2/2] Removes author name falsely used as recipient name in backoffice emails --- .../submissions/emails/submission_classified_for_services.txt | 2 +- .../templates/submissions/emails/submission_complemented.txt | 2 +- .../submissions/emails/submission_prolongation_for_services.txt | 2 +- .../submissions/emails/submission_received_for_services.txt | 2 +- .../templates/submissions/emails/submission_submitted.txt | 2 +- .../submissions/emails/submission_submitted_with_mention.txt | 2 +- .../templates/submissions/emails/submission_validated.txt | 2 +- .../submissions/emails/submission_validation_reminder.txt | 2 +- .../submissions/emails/submission_validation_request.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) 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 index 748938a6f..5347eb69a 100644 --- 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 index 70e2aaf3c..7b47ad502 100644 --- 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/geocity/apps/submissions/templates/submissions/emails/submission_prolongation_for_services.txt b/geocity/apps/submissions/templates/submissions/emails/submission_prolongation_for_services.txt index cf9883423..3c39422d0 100644 --- a/geocity/apps/submissions/templates/submissions/emails/submission_prolongation_for_services.txt +++ b/geocity/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 index f8017c64b..879e1a512 100644 --- 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 index fbe678eb1..bfdcc5918 100644 --- 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 index 9d9057fac..edd4041f4 100644 --- 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 index b9f45e679..62112c10a 100644 --- 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 index 188146d86..9f2cb02af 100644 --- 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 index cfc27fe17..a0fd89fda 100644 --- 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." %}