From a0b1fa32e75e2dd002b73e9b09a137652ee861ec Mon Sep 17 00:00:00 2001 From: Skia Date: Fri, 2 Sep 2016 12:29:50 +0200 Subject: [PATCH] Fix subscription form --- locale/fr/LC_MESSAGES/django.mo | Bin 33255 -> 33170 bytes locale/fr/LC_MESSAGES/django.po | 177 +++++++++--------- subscription/models.py | 2 +- .../templates/subscription/subscription.jinja | 1 + subscription/views.py | 2 + 5 files changed, 95 insertions(+), 87 deletions(-) diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index dee8849dd5a2b1bb31a2c5e06671c113f373df03..ee443c85478b464eeac4b3f8cdc50a7a20c56e32 100644 GIT binary patch delta 10092 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 Bw8H=Z delta 10193 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\n" "Language-Team: AE info \n" @@ -134,7 +134,7 @@ msgid "comment" msgstr "commentaire" #: accounting/models.py:181 counter/models.py:204 counter/models.py:247 -#: subscription/models.py:53 +#: subscription/models.py:57 msgid "payment method" msgstr "méthode de paiement" @@ -162,8 +162,7 @@ msgstr "type comptable" msgid "target type" msgstr "type de cible" -#: accounting/models.py:190 club/templates/club/club_detail.jinja:21 -#: club/templates/club/club_members.jinja:8 +#: accounting/models.py:190 club/templates/club/club_members.jinja:8 #: launderette/templates/launderette/launderette_admin.jinja:44 msgid "User" msgstr "Utilisateur" @@ -180,7 +179,7 @@ msgstr "Compte" msgid "Company" msgstr "Entreprise" -#: accounting/models.py:190 sith/settings.py:283 sith/settings_sample.py:272 +#: accounting/models.py:190 sith/settings.py:287 sith/settings_sample.py:272 msgid "Other" msgstr "Autre" @@ -304,6 +303,7 @@ msgid "Delete" msgstr "Supprimer" #: accounting/templates/accounting/bank_account_details.jinja:17 +#: club/templates/club/club_base.jinja:11 #: core/templates/core/user_base.jinja:12 msgid "Infos" msgstr "Infos" @@ -324,7 +324,7 @@ msgstr "Nouveau compte club" #: accounting/templates/accounting/bank_account_list.jinja:21 #: accounting/templates/accounting/club_account_details.jinja:53 #: accounting/templates/accounting/journal_details.jinja:66 -#: club/templates/club/club_detail.jinja:8 core/templates/core/file.jinja:38 +#: club/templates/club/club_base.jinja:34 core/templates/core/file.jinja:38 #: core/templates/core/page.jinja:31 core/templates/core/user_base.jinja:33 #: core/templates/core/user_tools.jinja:33 #: counter/templates/counter/counter_list.jinja:20 @@ -490,7 +490,7 @@ msgstr "Éditer l'opération" #: core/templates/core/file_edit.jinja:8 core/templates/core/page_prop.jinja:8 #: core/templates/core/pagerev_edit.jinja:24 #: counter/templates/counter/cash_register_summary.jinja:22 -#: subscription/templates/subscription/subscription.jinja:22 +#: subscription/templates/subscription/subscription.jinja:23 msgid "Save" msgstr "Sauver" @@ -566,24 +566,19 @@ msgstr "L'utilisateur est déjà membre de ce club" msgid "past member" msgstr "Anciens membres" -#: club/templates/club/club_detail.jinja:6 -#: core/templates/core/group_edit.jinja:4 -msgid "Back to list" -msgstr "Retour à la liste" - -#: club/templates/club/club_detail.jinja:11 core/templates/core/file.jinja:41 -#: core/templates/core/page.jinja:34 -msgid "Prop" -msgstr "Propriétés" - -#: club/templates/club/club_detail.jinja:15 +#: club/templates/club/club_base.jinja:18 msgid "Members" msgstr "Membres" -#: club/templates/club/club_detail.jinja:22 -#: club/templates/club/club_members.jinja:9 -msgid "Role" -msgstr "Rôle" +#: club/templates/club/club_base.jinja:26 core/templates/core/base.jinja:25 +#: core/templates/core/user_base.jinja:19 +msgid "Tools" +msgstr "Outils" + +#: club/templates/club/club_base.jinja:42 +#: counter/templates/counter/counter_list.jinja:23 +msgid "Props" +msgstr "Propriétés" #: club/templates/club/club_edit.jinja:4 msgid "Edit club" @@ -610,7 +605,15 @@ msgstr "Il n'y a pas de club dans ce site web." msgid "Club members" msgstr "Membres du club" -#: club/templates/club/club_members.jinja:23 +#: club/templates/club/club_members.jinja:9 +msgid "Role" +msgstr "Rôle" + +#: club/templates/club/club_members.jinja:10 +msgid "Description" +msgstr "Description" + +#: club/templates/club/club_members.jinja:25 #: core/templates/core/file_detail.jinja:19 launderette/views.py:146 msgid "Add" msgstr "Ajouter" @@ -620,15 +623,15 @@ msgstr "Ajouter" msgid "Club tools" msgstr "Outils club" -#: club/templates/club/club_tools.jinja:8 +#: club/templates/club/club_tools.jinja:7 msgid "Counters:" msgstr "Comptoirs : " -#: club/templates/club/club_tools.jinja:19 +#: club/templates/club/club_tools.jinja:18 msgid "Accouting: " msgstr "Comptabilité : " -#: club/templates/club/club_tools.jinja:27 +#: club/templates/club/club_tools.jinja:26 msgid "Manage launderettes" msgstr "Gestion des laveries" @@ -1049,10 +1052,6 @@ msgstr "Connexion" msgid "Register" msgstr "S'enregister" -#: core/templates/core/base.jinja:25 core/templates/core/user_base.jinja:19 -msgid "Tools" -msgstr "Outils" - #: core/templates/core/base.jinja:26 msgid "Logout" msgstr "Déconnexion" @@ -1154,6 +1153,10 @@ msgstr "Non trouvé" msgid "My files" msgstr "Mes fichiers" +#: core/templates/core/file.jinja:41 core/templates/core/page.jinja:34 +msgid "Prop" +msgstr "Propriétés" + #: core/templates/core/file_detail.jinja:13 msgid "Owner: " msgstr "Propriétaire : " @@ -1186,6 +1189,10 @@ msgstr "Télécharger" msgid "There is no file in this website." msgstr "Il n'y a pas de fichier sur ce site web." +#: core/templates/core/group_edit.jinja:4 +msgid "Back to list" +msgstr "Retour à la liste" + #: core/templates/core/group_edit.jinja:5 msgid "Edit group" msgstr "Éditer le groupe" @@ -1658,7 +1665,7 @@ msgstr "Ajouter un nouveau dossier" 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:61 core/views/forms.py:171 core/views/forms.py:175 +#: core/views/files.py:61 core/views/forms.py:172 core/views/forms.py:176 #, python-format msgid "Error uploading file %(file_name)s: %(msg)s" msgstr "Erreur d'envoie du fichier %(file_name)s : %(msg)s" @@ -1671,11 +1678,11 @@ msgstr "Choisir un fichier" msgid "Choose user" msgstr "Choisir un utilisateur" -#: core/views/forms.py:88 +#: core/views/forms.py:89 msgid "Username, email, or account number" msgstr "Nom d'utilisateur, email, ou numéro de compte AE" -#: core/views/forms.py:130 +#: core/views/forms.py:131 msgid "" "Profile: you need to be visible on the picture, in order to be recognized (e." "g. by the barmen)" @@ -1683,15 +1690,15 @@ msgstr "" "Photo de profil: vous devez être visible sur la photo afin d'être reconnu " "(par exemple par les barmen)" -#: core/views/forms.py:131 +#: core/views/forms.py:132 msgid "Avatar: used on the forum" msgstr "Avatar : utilisé sur le forum" -#: core/views/forms.py:132 +#: core/views/forms.py:133 msgid "Scrub: let other know how your scrub looks like!" msgstr "Blouse : montrez aux autres à quoi ressemble votre blouse !" -#: core/views/forms.py:176 +#: core/views/forms.py:177 msgid "Bad image format, only jpeg, png, and gif are accepted" msgstr "Mauvais format d'image, seuls les jpeg, png, et gif sont acceptés" @@ -1775,7 +1782,7 @@ msgstr "Bureau" #: eboutic/templates/eboutic/eboutic_main.jinja:24 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:8 #: eboutic/templates/eboutic/eboutic_payment_result.jinja:4 -#: sith/settings.py:282 sith/settings.py:290 sith/settings_sample.py:271 +#: sith/settings.py:286 sith/settings.py:294 sith/settings_sample.py:271 #: sith/settings_sample.py:279 msgid "Eboutic" msgstr "Eboutic" @@ -1813,8 +1820,8 @@ msgstr "quantité" msgid "Sith account" msgstr "Compte utilisateur" -#: counter/models.py:248 sith/settings.py:275 sith/settings.py:280 -#: sith/settings.py:302 sith/settings_sample.py:264 +#: counter/models.py:248 sith/settings.py:279 sith/settings.py:284 +#: sith/settings.py:306 sith/settings_sample.py:264 #: sith/settings_sample.py:269 sith/settings_sample.py:291 msgid "Credit card" msgstr "Carte bancaire" @@ -1917,10 +1924,6 @@ msgstr "Liste des comptoirs" msgid "New counter" msgstr "Nouveau comptoir" -#: counter/templates/counter/counter_list.jinja:23 -msgid "Props" -msgstr "Propriétés" - #: counter/templates/counter/counter_list.jinja:29 msgid "There is no counters in this website." msgstr "Il n'y a pas de comptoirs dans ce site web." @@ -2228,12 +2231,12 @@ msgid "Washing and drying" msgstr "Lavage et séchage" #: launderette/templates/launderette/launderette_book.jinja:26 -#: sith/settings.py:416 sith/settings_sample.py:405 +#: sith/settings.py:420 sith/settings_sample.py:405 msgid "Washing" msgstr "Lavage" #: launderette/templates/launderette/launderette_book.jinja:30 -#: sith/settings.py:416 sith/settings_sample.py:405 +#: sith/settings.py:420 sith/settings_sample.py:405 msgid "Drying" msgstr "Séchage" @@ -2288,120 +2291,116 @@ msgstr "L'utilisateur n'a pas réservé de créneau" msgid "Token not found" msgstr "Jeton non trouvé" -#: sith/settings.py:170 sith/settings_sample.py:160 +#: sith/settings.py:174 sith/settings_sample.py:160 msgid "English" msgstr "Anglais" -#: sith/settings.py:171 sith/settings_sample.py:161 +#: sith/settings.py:175 sith/settings_sample.py:161 msgid "French" msgstr "Français" -#: sith/settings.py:272 sith/settings.py:279 sith/settings.py:300 +#: sith/settings.py:276 sith/settings.py:283 sith/settings.py:304 #: sith/settings_sample.py:261 sith/settings_sample.py:268 #: sith/settings_sample.py:289 msgid "Check" msgstr "Chèque" -#: sith/settings.py:273 sith/settings.py:281 sith/settings.py:301 +#: sith/settings.py:277 sith/settings.py:285 sith/settings.py:305 #: sith/settings_sample.py:262 sith/settings_sample.py:270 #: sith/settings_sample.py:290 msgid "Cash" msgstr "Espèces" -#: sith/settings.py:274 sith/settings_sample.py:263 +#: sith/settings.py:278 sith/settings_sample.py:263 msgid "Transfert" msgstr "Virement" -#: sith/settings.py:287 sith/settings_sample.py:276 +#: sith/settings.py:291 sith/settings_sample.py:276 msgid "Belfort" msgstr "Belfort" -#: sith/settings.py:288 sith/settings_sample.py:277 +#: sith/settings.py:292 sith/settings_sample.py:277 msgid "Sevenans" msgstr "Sevenans" -#: sith/settings.py:289 sith/settings_sample.py:278 +#: sith/settings.py:293 sith/settings_sample.py:278 msgid "Montbéliard" msgstr "Montbéliard" -#: sith/settings.py:329 sith/settings_sample.py:318 +#: sith/settings.py:333 sith/settings_sample.py:318 msgid "One semester" msgstr "Un semestre, 15 €" -#: sith/settings.py:334 sith/settings_sample.py:323 +#: sith/settings.py:338 sith/settings_sample.py:323 msgid "Two semesters" msgstr "Deux semestres, 28 €" -#: sith/settings.py:339 sith/settings_sample.py:328 +#: sith/settings.py:343 sith/settings_sample.py:328 msgid "Common core cursus" msgstr "Cursus tronc commun, 45 €" -#: sith/settings.py:344 sith/settings_sample.py:333 +#: sith/settings.py:348 sith/settings.py:353 sith/settings_sample.py:333 #: sith/settings_sample.py:338 msgid "Branch cursus" msgstr "Cursus branche, 45 €" -#: sith/settings.py:349 -msgid "Alternating cursus" -msgstr "Cursus alternant, 30 €" - -#: sith/settings.py:354 sith/settings_sample.py:343 +#: sith/settings.py:358 sith/settings_sample.py:343 msgid "Honorary member" msgstr "Membre honoraire, 0 €" -#: sith/settings.py:359 sith/settings_sample.py:348 +#: sith/settings.py:363 sith/settings_sample.py:348 msgid "Assidu member" msgstr "Membre d'Assidu, 0 €" -#: sith/settings.py:364 sith/settings_sample.py:353 +#: sith/settings.py:368 sith/settings_sample.py:353 msgid "Amicale/DOCEO member" msgstr "Membre de l'Amicale/DOCEO, 0 €" -#: sith/settings.py:369 sith/settings_sample.py:358 +#: sith/settings.py:373 sith/settings_sample.py:358 msgid "UT network member" msgstr "Cotisant du réseau UT, 0 €" -#: sith/settings.py:374 sith/settings_sample.py:363 +#: sith/settings.py:378 sith/settings_sample.py:363 msgid "CROUS member" msgstr "Membres du CROUS, 0 €" -#: sith/settings.py:379 sith/settings_sample.py:368 +#: sith/settings.py:383 sith/settings_sample.py:368 msgid "Sbarro/ESTA member" msgstr "Membre de Sbarro ou de l'ESTA, 15 €" -#: sith/settings.py:387 sith/settings_sample.py:376 +#: sith/settings.py:391 sith/settings_sample.py:376 msgid "President" msgstr "Président" -#: sith/settings.py:388 sith/settings_sample.py:377 +#: sith/settings.py:392 sith/settings_sample.py:377 msgid "Vice-President" msgstr "Vice-Président" -#: sith/settings.py:389 sith/settings_sample.py:378 +#: sith/settings.py:393 sith/settings_sample.py:378 msgid "Treasurer" msgstr "Trésorier" -#: sith/settings.py:390 sith/settings_sample.py:379 +#: sith/settings.py:394 sith/settings_sample.py:379 msgid "Communication supervisor" msgstr "Responsable com" -#: sith/settings.py:391 sith/settings_sample.py:380 +#: sith/settings.py:395 sith/settings_sample.py:380 msgid "Secretary" msgstr "Secrétaire" -#: sith/settings.py:392 sith/settings_sample.py:381 +#: sith/settings.py:396 sith/settings_sample.py:381 msgid "IT supervisor" msgstr "Responsable info" -#: sith/settings.py:393 sith/settings_sample.py:382 +#: sith/settings.py:397 sith/settings_sample.py:382 msgid "Board member" msgstr "Membre du bureau" -#: sith/settings.py:394 sith/settings_sample.py:383 +#: sith/settings.py:398 sith/settings_sample.py:383 msgid "Active member" msgstr "Membre actif" -#: sith/settings.py:395 sith/settings_sample.py:384 +#: sith/settings.py:399 sith/settings_sample.py:384 msgid "Curious" msgstr "Curieux" @@ -2413,35 +2412,41 @@ msgstr "Mauvais type de cotisation" msgid "Bad payment method" msgstr "Mauvais type de paiement" -#: subscription/models.py:48 +#: subscription/models.py:52 msgid "subscription type" msgstr "type d'inscription" -#: subscription/models.py:51 +#: subscription/models.py:55 msgid "subscription start" msgstr "début de la cotisation" -#: subscription/models.py:52 +#: subscription/models.py:56 msgid "subscription end" msgstr "fin de la cotisation" -#: subscription/models.py:55 +#: subscription/models.py:59 msgid "location" msgstr "lieu" -#: subscription/models.py:64 +#: subscription/models.py:68 msgid "You can not subscribe many time for the same period" msgstr "Vous ne pouvez pas cotiser plusieurs fois pour la même période" -#: subscription/models.py:68 -msgid "You are trying to create a subscription without member" -msgstr "Vous essayez de créer une cotisation sans membre" +#: subscription/models.py:72 +msgid "Subscription error" +msgstr "Erreur de cotisation" -#: subscription/views.py:52 +#: subscription/views.py:54 msgid "A user with that email address already exists" msgstr "Un utilisateur avec cette adresse email existe déjà" -#: subscription/views.py:68 +#: subscription/views.py:70 msgid "You must either choose an existing user or create a new one properly" msgstr "" "Vous devez soit choisir un utilisateur existant, ou en créer un proprement." + +#~ msgid "Alternating cursus" +#~ msgstr "Cursus alternant, 30 €" + +#~ msgid "You are trying to create a subscription without member" +#~ msgstr "Vous essayez de créer une cotisation sans membre" diff --git a/subscription/models.py b/subscription/models.py index c96bf1c7..e6145ec7 100644 --- a/subscription/models.py +++ b/subscription/models.py @@ -69,7 +69,7 @@ class Subscription(models.Model): except: # This should not happen, because the form should have handled the data before, but sadly, it still # calls the model validation :'( # TODO see SubscriptionForm's clean method - raise ValidationError(_("You are trying to create a subscription without member")) + raise ValidationError(_("Subscription error")) def save(self): super(Subscription, self).save() diff --git a/subscription/templates/subscription/subscription.jinja b/subscription/templates/subscription/subscription.jinja index dc1a33b8..40e842c2 100644 --- a/subscription/templates/subscription/subscription.jinja +++ b/subscription/templates/subscription/subscription.jinja @@ -9,6 +9,7 @@
{% csrf_token %} + {{ form.non_field_errors() }}

{{ form.member.errors }} {{ form.member }}

{{ form.first_name.errors }} {{ form.first_name }}

diff --git a/subscription/views.py b/subscription/views.py index 9f8c9039..42134ac3 100644 --- a/subscription/views.py +++ b/subscription/views.py @@ -48,6 +48,8 @@ class SubscriptionForm(forms.ModelForm): and "first_name" not in self.errors.as_data() and "email" not in self.errors.as_data()): self.errors.pop("member", None) + if self.errors: + return cleaned_data if Subscriber.objects.filter(email=cleaned_data.get("email")).first() is not None: self.add_error("email", ValidationError(_("A user with that email address already exists"))) else: