ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

🐛 Fix signup

This commit is contained in:
Yohann D'ANELLO 2020-08-06 19:56:37 +02:00
parent 48a7128370
commit fd2f426f55
4 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/member/forms.py
View File

@ -37,6 +37,8 @@ class ProfileForm(forms.ModelForm):
""" """
A form for the extras field provided by the :model:`member.Profile` model. A form for the extras field provided by the :model:`member.Profile` model.
""" """
report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"))
last_report = forms.DateField(required=False, disabled=True, label=_("Last report date")) last_report = forms.DateField(required=False, disabled=True, label=_("Last report date"))
def save(self, commit=True): def save(self, commit=True):

2
apps/member/models.py
View File

@ -99,7 +99,7 @@ class Profile(models.Model):
last_report = models.DateField( last_report = models.DateField(
verbose_name=_("last report date"), verbose_name=_("last report date"),
default=timezone.now, default=timezone.now().date(),
) )
email_confirmed = models.BooleanField( email_confirmed = models.BooleanField(

30
locale/de/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-06 17:40+0200\n" "POT-Creation-Date: 2020-08-06 19:55+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -198,13 +198,13 @@ msgstr ""
msgid "Type" msgid "Type"
msgstr "" msgstr ""
#: apps/activity/tables.py:81 apps/member/forms.py:104 #: apps/activity/tables.py:81 apps/member/forms.py:106
#: apps/registration/forms.py:70 apps/treasury/forms.py:130 #: apps/registration/forms.py:70 apps/treasury/forms.py:130
#: apps/wei/forms/registration.py:94 #: apps/wei/forms/registration.py:94
msgid "Last name" msgid "Last name"
msgstr "" msgstr ""
#: apps/activity/tables.py:83 apps/member/forms.py:109 #: apps/activity/tables.py:83 apps/member/forms.py:111
#: apps/registration/forms.py:75 apps/treasury/forms.py:132 #: apps/registration/forms.py:75 apps/treasury/forms.py:132
#: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131 #: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131
msgid "First name" msgid "First name"
@ -327,52 +327,56 @@ msgid "member"
msgstr "" msgstr ""
#: apps/member/forms.py:40 #: apps/member/forms.py:40
msgid "Report frequency"
msgstr ""
#: apps/member/forms.py:42
msgid "Last report date" msgid "Last report date"
msgstr "" msgstr ""
#: apps/member/forms.py:60 apps/member/views.py:86 #: apps/member/forms.py:62 apps/member/views.py:86
#: apps/registration/forms.py:28 #: apps/registration/forms.py:28
msgid "An alias with a similar name already exists." msgid "An alias with a similar name already exists."
msgstr "" msgstr ""
#: apps/member/forms.py:83 apps/registration/forms.py:50 #: apps/member/forms.py:85 apps/registration/forms.py:50
msgid "Inscription paid by Société Générale" msgid "Inscription paid by Société Générale"
msgstr "" msgstr ""
#: apps/member/forms.py:85 apps/registration/forms.py:52 #: apps/member/forms.py:87 apps/registration/forms.py:52
msgid "Check this case is the Société Générale paid the inscription." msgid "Check this case is the Société Générale paid the inscription."
msgstr "" msgstr ""
#: apps/member/forms.py:90 apps/registration/forms.py:57 #: apps/member/forms.py:92 apps/registration/forms.py:57
#: apps/wei/forms/registration.py:81 #: apps/wei/forms/registration.py:81
msgid "Credit type" msgid "Credit type"
msgstr "" msgstr ""
#: apps/member/forms.py:91 apps/registration/forms.py:58 #: apps/member/forms.py:93 apps/registration/forms.py:58
#: apps/wei/forms/registration.py:82 #: apps/wei/forms/registration.py:82
msgid "No credit" msgid "No credit"
msgstr "" msgstr ""
#: apps/member/forms.py:93 #: apps/member/forms.py:95
msgid "You can credit the note of the user." msgid "You can credit the note of the user."
msgstr "" msgstr ""
#: apps/member/forms.py:97 apps/registration/forms.py:63 #: apps/member/forms.py:99 apps/registration/forms.py:63
#: apps/wei/forms/registration.py:87 #: apps/wei/forms/registration.py:87
msgid "Credit amount" msgid "Credit amount"
msgstr "" msgstr ""
#: apps/member/forms.py:114 apps/registration/forms.py:80 #: apps/member/forms.py:116 apps/registration/forms.py:80
#: apps/treasury/forms.py:134 apps/wei/forms/registration.py:104 #: apps/treasury/forms.py:134 apps/wei/forms/registration.py:104
#: templates/note/transaction_form.html:137 #: templates/note/transaction_form.html:137
msgid "Bank" msgid "Bank"
msgstr "" msgstr ""
#: apps/member/forms.py:141 #: apps/member/forms.py:143
msgid "User" msgid "User"
msgstr "" msgstr ""
#: apps/member/forms.py:155 #: apps/member/forms.py:157
msgid "Roles" msgid "Roles"
msgstr "" msgstr ""

30
locale/fr/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-06 17:40+0200\n" "POT-Creation-Date: 2020-08-06 19:55+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -199,13 +199,13 @@ msgstr "supprimer"
msgid "Type" msgid "Type"
msgstr "Type" msgstr "Type"
#: apps/activity/tables.py:81 apps/member/forms.py:104 #: apps/activity/tables.py:81 apps/member/forms.py:106
#: apps/registration/forms.py:70 apps/treasury/forms.py:130 #: apps/registration/forms.py:70 apps/treasury/forms.py:130
#: apps/wei/forms/registration.py:94 #: apps/wei/forms/registration.py:94
msgid "Last name" msgid "Last name"
msgstr "Nom de famille" msgstr "Nom de famille"
#: apps/activity/tables.py:83 apps/member/forms.py:109 #: apps/activity/tables.py:83 apps/member/forms.py:111
#: apps/registration/forms.py:75 apps/treasury/forms.py:132 #: apps/registration/forms.py:75 apps/treasury/forms.py:132
#: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131 #: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131
msgid "First name" msgid "First name"
@ -328,52 +328,56 @@ msgid "member"
msgstr "adhérent" msgstr "adhérent"
#: apps/member/forms.py:40 #: apps/member/forms.py:40
msgid "Report frequency"
msgstr "Fréquence des rapports (en jours)"
#: apps/member/forms.py:42
msgid "Last report date" msgid "Last report date"
msgstr "Date de dernier rapport" msgstr "Date de dernier rapport"
#: apps/member/forms.py:60 apps/member/views.py:86 #: apps/member/forms.py:62 apps/member/views.py:86
#: apps/registration/forms.py:28 #: apps/registration/forms.py:28
msgid "An alias with a similar name already exists." msgid "An alias with a similar name already exists."
msgstr "Un alias avec un nom similaire existe déjà." msgstr "Un alias avec un nom similaire existe déjà."
#: apps/member/forms.py:83 apps/registration/forms.py:50 #: apps/member/forms.py:85 apps/registration/forms.py:50
msgid "Inscription paid by Société Générale" msgid "Inscription paid by Société Générale"
msgstr "Inscription payée par la Société générale" msgstr "Inscription payée par la Société générale"
#: apps/member/forms.py:85 apps/registration/forms.py:52 #: apps/member/forms.py:87 apps/registration/forms.py:52
msgid "Check this case is the Société Générale paid the inscription." msgid "Check this case is the Société Générale paid the inscription."
msgstr "Cochez cette case si la Société Générale a payé l'inscription." msgstr "Cochez cette case si la Société Générale a payé l'inscription."
#: apps/member/forms.py:90 apps/registration/forms.py:57 #: apps/member/forms.py:92 apps/registration/forms.py:57
#: apps/wei/forms/registration.py:81 #: apps/wei/forms/registration.py:81
msgid "Credit type" msgid "Credit type"
msgstr "Type de rechargement" msgstr "Type de rechargement"
#: apps/member/forms.py:91 apps/registration/forms.py:58 #: apps/member/forms.py:93 apps/registration/forms.py:58
#: apps/wei/forms/registration.py:82 #: apps/wei/forms/registration.py:82
msgid "No credit" msgid "No credit"
msgstr "Pas de rechargement" msgstr "Pas de rechargement"
#: apps/member/forms.py:93 #: apps/member/forms.py:95
msgid "You can credit the note of the user." msgid "You can credit the note of the user."
msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion." msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion."
#: apps/member/forms.py:97 apps/registration/forms.py:63 #: apps/member/forms.py:99 apps/registration/forms.py:63
#: apps/wei/forms/registration.py:87 #: apps/wei/forms/registration.py:87
msgid "Credit amount" msgid "Credit amount"
msgstr "Montant à créditer" msgstr "Montant à créditer"
#: apps/member/forms.py:114 apps/registration/forms.py:80 #: apps/member/forms.py:116 apps/registration/forms.py:80
#: apps/treasury/forms.py:134 apps/wei/forms/registration.py:104 #: apps/treasury/forms.py:134 apps/wei/forms/registration.py:104
#: templates/note/transaction_form.html:137 #: templates/note/transaction_form.html:137
msgid "Bank" msgid "Bank"
msgstr "Banque" msgstr "Banque"
#: apps/member/forms.py:141 #: apps/member/forms.py:143
msgid "User" msgid "User"
msgstr "Utilisateur" msgstr "Utilisateur"
#: apps/member/forms.py:155 #: apps/member/forms.py:157
msgid "Roles" msgid "Roles"
msgstr "Rôles" msgstr "Rôles"