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

Change help text in membership fields in club form

This commit is contained in:
Yohann D'ANELLO 2020-08-07 14:20:34 +02:00
parent 88917dde23
commit ad59b5c81e
3 changed files with 45 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/member/models.py
View File

@ -216,17 +216,14 @@ class Club(models.Model):
blank=True, blank=True,
null=True, null=True,
verbose_name=_('membership start'), verbose_name=_('membership start'),
help_text=_('How long after January 1st the members can renew ' help_text=_('Date from which the members can renew their membership.'),
'their membership.'),
) )
membership_end = models.DateField( membership_end = models.DateField(
blank=True, blank=True,
null=True, null=True,
verbose_name=_('membership end'), verbose_name=_('membership end'),
help_text=_('How long the membership can last after January 1st ' help_text=_('Maximal date of a membership, after which members must renew it.'),
'of the next year after members can renew their '
'membership.'),
) )
def update_membership_dates(self): def update_membership_dates(self):

38
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-07 11:03+0200\n" "POT-Creation-Date: 2020-08-07 14:17+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"
@ -95,7 +95,7 @@ msgstr ""
msgid "type" msgid "type"
msgstr "" msgstr ""
#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 #: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:277
#: apps/note/models/notes.py:126 apps/treasury/models.py:266 #: apps/note/models/notes.py:126 apps/treasury/models.py:266
#: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14
#: templates/wei/survey.html:16 #: templates/wei/survey.html:16
@ -315,11 +315,11 @@ msgstr ""
msgid "membership fee (unpaid students)" msgid "membership fee (unpaid students)"
msgstr "" msgstr ""
#: apps/member/admin.py:67 apps/member/models.py:291 #: apps/member/admin.py:67 apps/member/models.py:288
msgid "roles" msgid "roles"
msgstr "" msgstr ""
#: apps/member/admin.py:68 apps/member/models.py:305 #: apps/member/admin.py:68 apps/member/models.py:302
msgid "fee" msgid "fee"
msgstr "" msgstr ""
@ -544,59 +544,57 @@ msgid "membership start"
msgstr "" msgstr ""
#: apps/member/models.py:219 #: apps/member/models.py:219
msgid "How long after January 1st the members can renew their membership." msgid "Date from which the members can renew their membership."
msgstr "" msgstr ""
#: apps/member/models.py:226 templates/member/club_info.html:28 #: apps/member/models.py:225 templates/member/club_info.html:28
msgid "membership end" msgid "membership end"
msgstr "" msgstr ""
#: apps/member/models.py:227 #: apps/member/models.py:226
msgid "" msgid "Maximal date of a membership, after which members must renew it."
"How long the membership can last after January 1st of the next year after "
"members can renew their membership."
msgstr "" msgstr ""
#: apps/member/models.py:261 apps/member/models.py:286 #: apps/member/models.py:258 apps/member/models.py:283
#: apps/note/models/notes.py:163 #: apps/note/models/notes.py:163
msgid "club" msgid "club"
msgstr "" msgstr ""
#: apps/member/models.py:262 #: apps/member/models.py:259
msgid "clubs" msgid "clubs"
msgstr "" msgstr ""
#: apps/member/models.py:296 #: apps/member/models.py:293
msgid "membership starts on" msgid "membership starts on"
msgstr "" msgstr ""
#: apps/member/models.py:300 #: apps/member/models.py:297
msgid "membership ends on" msgid "membership ends on"
msgstr "" msgstr ""
#: apps/member/models.py:351 #: apps/member/models.py:348
#, python-brace-format #, python-brace-format
msgid "The role {role} does not apply to the club {club}." msgid "The role {role} does not apply to the club {club}."
msgstr "" msgstr ""
#: apps/member/models.py:362 apps/member/views.py:592 #: apps/member/models.py:359 apps/member/views.py:592
msgid "User is already a member of the club" msgid "User is already a member of the club"
msgstr "" msgstr ""
#: apps/member/models.py:409 #: apps/member/models.py:406
msgid "User is not a member of the parent club" msgid "User is not a member of the parent club"
msgstr "" msgstr ""
#: apps/member/models.py:462 #: apps/member/models.py:459
#, python-brace-format #, python-brace-format
msgid "Membership of {user} for the club {club}" msgid "Membership of {user} for the club {club}"
msgstr "" msgstr ""
#: apps/member/models.py:465 #: apps/member/models.py:462
msgid "membership" msgid "membership"
msgstr "" msgstr ""
#: apps/member/models.py:466 #: apps/member/models.py:463
msgid "memberships" msgid "memberships"
msgstr "" msgstr ""

70
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-07 11:03+0200\n" "POT-Creation-Date: 2020-08-07 14:17+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"
@ -96,7 +96,7 @@ msgstr "lieu"
msgid "type" msgid "type"
msgstr "type" msgstr "type"
#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 #: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:277
#: apps/note/models/notes.py:126 apps/treasury/models.py:266 #: apps/note/models/notes.py:126 apps/treasury/models.py:266
#: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14
#: templates/wei/survey.html:16 #: templates/wei/survey.html:16
@ -316,11 +316,11 @@ msgstr "cotisation pour adhérer (normalien élève)"
msgid "membership fee (unpaid students)" msgid "membership fee (unpaid students)"
msgstr "cotisation pour adhérer (normalien étudiant)" msgstr "cotisation pour adhérer (normalien étudiant)"
#: apps/member/admin.py:67 apps/member/models.py:291 #: apps/member/admin.py:67 apps/member/models.py:288
msgid "roles" msgid "roles"
msgstr "rôles" msgstr "rôles"
#: apps/member/admin.py:68 apps/member/models.py:305 #: apps/member/admin.py:68 apps/member/models.py:302
msgid "fee" msgid "fee"
msgstr "cotisation" msgstr "cotisation"
@ -545,63 +545,59 @@ msgid "membership start"
msgstr "début de l'adhésion" msgstr "début de l'adhésion"
#: apps/member/models.py:219 #: apps/member/models.py:219
msgid "How long after January 1st the members can renew their membership." msgid "Date from which the members can renew their membership."
msgstr "" msgstr ""
"Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " "Date à partir de laquelle les adhérents peuvent renouveler leur "
"adhésion." "adhésion."
#: apps/member/models.py:226 templates/member/club_info.html:28 #: apps/member/models.py:225 templates/member/club_info.html:28
msgid "membership end" msgid "membership end"
msgstr "fin de l'adhésion" msgstr "fin de l'adhésion"
#: apps/member/models.py:227 #: apps/member/models.py:226
msgid "" msgid "Maximal date of a membership, after which members must renew it."
"How long the membership can last after January 1st of the next year after " msgstr "Date maximale d'une fin d'adhésion, après laquelle les adhérents doivent la renouveler."
"members can renew their membership."
msgstr ""
"Combien de temps l'adhésion peut durer après le 1er Janvier de l'année "
"suivante avant que les adhérents peuvent renouveler leur adhésion."
#: apps/member/models.py:261 apps/member/models.py:286 #: apps/member/models.py:258 apps/member/models.py:283
#: apps/note/models/notes.py:163 #: apps/note/models/notes.py:163
msgid "club" msgid "club"
msgstr "club" msgstr "club"
#: apps/member/models.py:262 #: apps/member/models.py:259
msgid "clubs" msgid "clubs"
msgstr "clubs" msgstr "clubs"
#: apps/member/models.py:296 #: apps/member/models.py:293
msgid "membership starts on" msgid "membership starts on"
msgstr "l'adhésion commence le" msgstr "l'adhésion commence le"
#: apps/member/models.py:300 #: apps/member/models.py:297
msgid "membership ends on" msgid "membership ends on"
msgstr "l'adhésion finit le" msgstr "l'adhésion finit le"
#: apps/member/models.py:351 #: apps/member/models.py:348
#, python-brace-format #, python-brace-format
msgid "The role {role} does not apply to the club {club}." msgid "The role {role} does not apply to the club {club}."
msgstr "Le rôle {role} ne s'applique pas au club {club}." msgstr "Le rôle {role} ne s'applique pas au club {club}."
#: apps/member/models.py:362 apps/member/views.py:592 #: apps/member/models.py:359 apps/member/views.py:592
msgid "User is already a member of the club" msgid "User is already a member of the club"
msgstr "L'utilisateur est déjà membre du club" msgstr "L'utilisateur est déjà membre du club"
#: apps/member/models.py:409 #: apps/member/models.py:406
msgid "User is not a member of the parent club" msgid "User is not a member of the parent club"
msgstr "L'utilisateur n'est pas membre du club parent" msgstr "L'utilisateur n'est pas membre du club parent"
#: apps/member/models.py:462 #: apps/member/models.py:459
#, python-brace-format #, python-brace-format
msgid "Membership of {user} for the club {club}" msgid "Membership of {user} for the club {club}"
msgstr "Adhésion de {user} pour le club {club}" msgstr "Adhésion de {user} pour le club {club}"
#: apps/member/models.py:465 #: apps/member/models.py:462
msgid "membership" msgid "membership"
msgstr "adhésion" msgstr "adhésion"
#: apps/member/models.py:466 #: apps/member/models.py:463
msgid "memberships" msgid "memberships"
msgstr "adhésions" msgstr "adhésions"
@ -1312,10 +1308,8 @@ msgid "An invoice can't be edited when it is locked."
msgstr "Une facture ne peut plus être modifiée si elle est verrouillée." msgstr "Une facture ne peut plus être modifiée si elle est verrouillée."
#: apps/treasury/models.py:75 #: apps/treasury/models.py:75
#, fuzzy
#| msgid "source"
msgid "tex source" msgid "tex source"
msgstr "source" msgstr "Fichier TeX source"
#: apps/treasury/models.py:88 templates/treasury/invoice_form.html:17 #: apps/treasury/models.py:88 templates/treasury/invoice_form.html:17
msgid "This invoice is locked and can no longer be edited." msgid "This invoice is locked and can no longer be edited."
@ -1452,10 +1446,8 @@ msgid "Update an invoice"
msgstr "Modifier la facture" msgstr "Modifier la facture"
#: apps/treasury/views.py:145 templates/treasury/invoice_confirm_delete.html:8 #: apps/treasury/views.py:145 templates/treasury/invoice_confirm_delete.html:8
#, fuzzy
#| msgid "New invoice"
msgid "Delete invoice" msgid "Delete invoice"
msgstr "Nouvelle facture" msgstr "Supprimer la facture"
#: apps/treasury/views.py:205 #: apps/treasury/views.py:205
msgid "Create a new remittance" msgid "Create a new remittance"
@ -2491,27 +2483,18 @@ msgstr ""
"lien que vous avez reçu." "lien que vous avez reçu."
#: templates/treasury/invoice_confirm_delete.html:13 #: templates/treasury/invoice_confirm_delete.html:13
#, fuzzy
#| msgid "This registration is already validated and can't be deleted."
msgid "This invoice is locked and can't be deleted." msgid "This invoice is locked and can't be deleted."
msgstr "L'inscription a déjà été validée et ne peut pas être supprimée." msgstr "Cette facture est verrouillée et ne peut pas être supprimée."
#: templates/treasury/invoice_confirm_delete.html:19 #: templates/treasury/invoice_confirm_delete.html:19
#, fuzzy
#| msgid ""
#| "Are you sure you want to delete the registration of %(user)s for the WEI "
#| "%(wei_name)s? This action can't be undone."
msgid "" msgid ""
"Are you sure you want to delete this invoice? This action can't be undone." "Are you sure you want to delete this invoice? This action can't be undone."
msgstr "" msgstr ""
"Êtes-vous sûr de vouloir supprimer l'inscription de %(user)s pour le WEI " "Êtes-vous sûr de vouloir supprimer cette facture ? Cette action ne pourra pas être annulée."
"%(wei_name)s ? Cette action ne pourra pas être annulée."
#: templates/treasury/invoice_confirm_delete.html:26 #: templates/treasury/invoice_confirm_delete.html:26
#, fuzzy
#| msgid "Return to credit list"
msgid "Return to invoices list" msgid "Return to invoices list"
msgstr "Retour à la liste des crédits" msgstr "Retour à la liste des factures"
#: templates/treasury/invoice_form.html:10 #: templates/treasury/invoice_form.html:10
msgid "" msgid ""
@ -2863,6 +2846,3 @@ msgstr "Il n'y a pas de pré-inscription en attente avec cette entrée."
#: templates/wei/weiregistration_list.html:24 #: templates/wei/weiregistration_list.html:24
msgid "View validated memberships..." msgid "View validated memberships..."
msgstr "Voir les adhésions validées ..." msgstr "Voir les adhésions validées ..."
#~ msgid "Place"
#~ msgstr "Lieu"