From 352b09d9cd448da7084911af6c00caa0d647d294 Mon Sep 17 00:00:00 2001
From: thomas girod <thgirod@hotmail.com>
Date: Sun, 1 Sep 2024 15:07:30 +0200
Subject: [PATCH] fix subscription form translation

---
 locale/fr/LC_MESSAGES/django.po | 20 ++++++++++----------
 subscription/views.py           | 26 +++++---------------------
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index e27b63b8..9d414839 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-27 17:02+0200\n"
+"POT-Creation-Date: 2024-09-01 15:19+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Skia <skia@libskia.so>\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -2265,11 +2265,11 @@ msgstr "miniature"
 msgid "owner"
 msgstr "propriétaire"
 
-#: core/models.py:896 core/models.py:1240 core/views/files.py:231
+#: core/models.py:896 core/models.py:1240 core/views/files.py:229
 msgid "edit group"
 msgstr "groupe d'édition"
 
-#: core/models.py:899 core/models.py:1243 core/views/files.py:234
+#: core/models.py:899 core/models.py:1243 core/views/files.py:232
 msgid "view group"
 msgstr "groupe de vue"
 
@@ -2499,7 +2499,7 @@ msgid "Launderette"
 msgstr "Laverie"
 
 #: core/templates/core/base.jinja:227 core/templates/core/file.jinja:20
-#: core/views/files.py:117
+#: core/views/files.py:115
 msgid "Files"
 msgstr "Fichiers"
 
@@ -3545,22 +3545,22 @@ msgid_plural "%(nb_days)d days, %(remainder)s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/views/files.py:114
+#: core/views/files.py:112
 msgid "Add a new folder"
 msgstr "Ajouter un nouveau dossier"
 
-#: core/views/files.py:134
+#: core/views/files.py:132
 #, python-format
 msgid "Error creating folder %(folder_name)s: %(msg)s"
 msgstr "Erreur de création du dossier %(folder_name)s : %(msg)s"
 
-#: core/views/files.py:154 core/views/forms.py:304 core/views/forms.py:311
+#: core/views/files.py:152 core/views/forms.py:304 core/views/forms.py:311
 #: sas/views.py:81
 #, python-format
 msgid "Error uploading file %(file_name)s: %(msg)s"
 msgstr "Erreur d'envoi du fichier %(file_name)s : %(msg)s"
 
-#: core/views/files.py:236 sas/views.py:359
+#: core/views/files.py:234 sas/views.py:359
 msgid "Apply rights recursively"
 msgstr "Appliquer les droits récursivement"
 
@@ -6013,11 +6013,11 @@ msgid "Eboutic is reserved to specific users. In doubt, don't use it."
 msgstr ""
 "Eboutic est réservé à des cas particuliers. Dans le doute, ne l'utilisez pas."
 
-#: subscription/views.py:93
+#: subscription/views.py:78
 msgid "A user with that email address already exists"
 msgstr "Un utilisateur avec cette adresse email existe déjà"
 
-#: subscription/views.py:116
+#: subscription/views.py:101
 msgid "You must either choose an existing user or create a new one properly"
 msgstr ""
 "Vous devez soit choisir un utilisateur existant, soit en créer un proprement"
diff --git a/subscription/views.py b/subscription/views.py
index 5dddcf84..c77aee0d 100644
--- a/subscription/views.py
+++ b/subscription/views.py
@@ -48,26 +48,11 @@ class SubscriptionForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        # Add fields to allow basic user creation
-        self.fields["last_name"] = forms.CharField(
-            max_length=User._meta.get_field("last_name").max_length
+        self.fields |= forms.fields_for_model(
+            User,
+            fields=["first_name", "last_name", "email", "date_of_birth"],
+            widgets={"date_of_birth": SelectDate},
         )
-        self.fields["first_name"] = forms.CharField(
-            max_length=User._meta.get_field("first_name").max_length
-        )
-        self.fields["email"] = forms.EmailField()
-        self.fields["date_of_birth"] = forms.DateField(widget=SelectDate)
-
-        self.field_order = [
-            "member",
-            "last_name",
-            "first_name",
-            "email",
-            "date_of_birth",
-            "subscription_type",
-            "payment_method",
-            "location",
-        ]
 
     def clean_member(self):
         subscriber = self.cleaned_data.get("member")
@@ -124,9 +109,8 @@ class NewSubscription(CreateView):
     form_class = SubscriptionForm
 
     def dispatch(self, request, *arg, **kwargs):
-        res = super().dispatch(request, *arg, **kwargs)
         if request.user.can_create_subscription:
-            return res
+            return super().dispatch(request, *arg, **kwargs)
         raise PermissionDenied
 
     def get_initial(self):