mirror of https://gitlab.crans.org/bde/nk20
🐛 WEI members must be members of the Kfet club *this year*
This commit is contained in:
parent
ba067f050e
commit
20ce817b16
|
@ -531,7 +531,12 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
|
||||||
return super().form_invalid(form)
|
return super().form_invalid(form)
|
||||||
|
|
||||||
if club.parent_club is not None:
|
if club.parent_club is not None:
|
||||||
if not Membership.objects.filter(user=form.instance.user, club=club.parent_club).exists():
|
if not Membership.objects.filter(
|
||||||
|
user=form.instance.user,
|
||||||
|
club=club.parent_club,
|
||||||
|
date_start__lte=form.instance.date_start,
|
||||||
|
date_end__gte=form.instance.date_start,
|
||||||
|
).exists():
|
||||||
form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name)
|
form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name)
|
||||||
return super().form_invalid(form)
|
return super().form_invalid(form)
|
||||||
|
|
||||||
|
|
|
@ -728,8 +728,7 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Crea
|
||||||
context["kfet_member"] = Membership.objects.filter(
|
context["kfet_member"] = Membership.objects.filter(
|
||||||
club__name="Kfet",
|
club__name="Kfet",
|
||||||
user=registration.user,
|
user=registration.user,
|
||||||
date_start__lte=datetime.now().date(),
|
date_start__gte=registration.wei.parent_club.membership_start,
|
||||||
date_end__gte=datetime.now().date(),
|
|
||||||
).exists()
|
).exists()
|
||||||
|
|
||||||
return context
|
return context
|
||||||
|
@ -788,9 +787,15 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Crea
|
||||||
form.add_error('bus', _("This user didn't give her/his caution check."))
|
form.add_error('bus', _("This user didn't give her/his caution check."))
|
||||||
return super().form_invalid(form)
|
return super().form_invalid(form)
|
||||||
|
|
||||||
if club.parent_club is not None:
|
if club.parent_club is not None: # parent_club is never None: this is Kfet.
|
||||||
if not Membership.objects.filter(user=form.instance.user, club=club.parent_club).exists():
|
# We want that the user is member of the Kfet club *of this year*: the Kfet membership is included
|
||||||
form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name)
|
# in the WEI registration.
|
||||||
|
if not Membership.objects.filter(
|
||||||
|
user=form.instance.user,
|
||||||
|
club=club.parent_club, # Kfet
|
||||||
|
date_start__gte=club.parent_club.membership_start,
|
||||||
|
).exists():
|
||||||
|
form.add_error('bus', _('User is not a member of the parent club') + ' ' + club.parent_club.name)
|
||||||
return super().form_invalid(form)
|
return super().form_invalid(form)
|
||||||
|
|
||||||
# Now, all is fine, the membership can be created.
|
# Now, all is fine, the membership can be created.
|
||||||
|
|
|
@ -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-03 18:38+0200\n"
|
"POT-Creation-Date: 2020-08-03 23:53+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"
|
||||||
|
@ -540,7 +540,7 @@ msgstr ""
|
||||||
msgid "membership ends on"
|
msgid "membership ends on"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/member/models.py:310 apps/member/views.py:535 apps/wei/views.py:793
|
#: apps/member/models.py:310 apps/member/views.py:540 apps/wei/views.py:798
|
||||||
msgid "User is not a member of the parent club"
|
msgid "User is not a member of the parent club"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -549,7 +549,7 @@ msgstr ""
|
||||||
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:328 apps/member/views.py:544
|
#: apps/member/models.py:328 apps/member/views.py:549
|
||||||
msgid "User is already a member of the club"
|
msgid "User is already a member of the club"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -620,31 +620,31 @@ msgstr ""
|
||||||
msgid "Add new member to the club"
|
msgid "Add new member to the club"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/member/views.py:530 apps/wei/views.py:784
|
#: apps/member/views.py:530 apps/wei/views.py:783
|
||||||
msgid ""
|
msgid ""
|
||||||
"This user don't have enough money to join this club, and can't have a "
|
"This user don't have enough money to join this club, and can't have a "
|
||||||
"negative balance."
|
"negative balance."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/member/views.py:548
|
#: apps/member/views.py:553
|
||||||
msgid "The membership must start after {:%m-%d-%Y}."
|
msgid "The membership must start after {:%m-%d-%Y}."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/member/views.py:553
|
#: apps/member/views.py:558
|
||||||
msgid "The membership must begin before {:%m-%d-%Y}."
|
msgid "The membership must begin before {:%m-%d-%Y}."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574
|
#: apps/member/views.py:575 apps/member/views.py:577 apps/member/views.py:579
|
||||||
#: apps/registration/views.py:290 apps/registration/views.py:292
|
#: apps/registration/views.py:290 apps/registration/views.py:292
|
||||||
#: apps/registration/views.py:294
|
#: apps/registration/views.py:294
|
||||||
msgid "This field is required."
|
msgid "This field is required."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/member/views.py:642
|
#: apps/member/views.py:647
|
||||||
msgid "Manage roles of an user in the club"
|
msgid "Manage roles of an user in the club"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/member/views.py:667
|
#: apps/member/views.py:672
|
||||||
msgid "Members of the club"
|
msgid "Members of the club"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -1448,7 +1448,7 @@ msgstr ""
|
||||||
msgid "Bus"
|
msgid "Bus"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:79
|
#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:32
|
||||||
msgid "Buses"
|
msgid "Buses"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -1704,25 +1704,25 @@ msgstr ""
|
||||||
msgid "Validate WEI registration"
|
msgid "Validate WEI registration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/wei/views.py:788
|
#: apps/wei/views.py:787
|
||||||
msgid "This user didn't give her/his caution check."
|
msgid "This user didn't give her/his caution check."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/wei/views.py:825 apps/wei/views.py:878 apps/wei/views.py:888
|
#: apps/wei/views.py:830 apps/wei/views.py:883 apps/wei/views.py:893
|
||||||
#: templates/wei/survey.html:12 templates/wei/survey_closed.html:12
|
#: templates/wei/survey.html:12 templates/wei/survey_closed.html:12
|
||||||
#: templates/wei/survey_end.html:12
|
#: templates/wei/survey_end.html:12
|
||||||
msgid "Survey WEI"
|
msgid "Survey WEI"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: note_kfet/settings/base.py:155
|
#: note_kfet/settings/base.py:156
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: note_kfet/settings/base.py:156
|
#: note_kfet/settings/base.py:157
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: note_kfet/settings/base.py:157
|
#: note_kfet/settings/base.py:158
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -1921,16 +1921,16 @@ msgstr ""
|
||||||
msgid "There is no membership found with this pattern."
|
msgid "There is no membership found with this pattern."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/member/club_tables.html:7
|
#: templates/member/club_tables.html:9
|
||||||
msgid "Club managers"
|
msgid "Club managers"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/member/club_tables.html:20
|
#: templates/member/club_tables.html:22
|
||||||
msgid "Club members"
|
msgid "Club members"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/member/club_tables.html:33 templates/member/profile_tables.html:28
|
#: templates/member/club_tables.html:35 templates/member/profile_tables.html:26
|
||||||
#: templates/wei/weiclub_tables.html:105
|
#: templates/wei/weiclub_tables.html:58
|
||||||
msgid "Transaction history"
|
msgid "Transaction history"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -2470,23 +2470,23 @@ msgstr ""
|
||||||
msgid "WEI listing"
|
msgid "WEI listing"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/wei/weiclub_tables.html:63
|
#: templates/wei/weiclub_tables.html:16
|
||||||
msgid "Register to the WEI! – 1A"
|
msgid "Register to the WEI! – 1A"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/wei/weiclub_tables.html:65
|
#: templates/wei/weiclub_tables.html:18
|
||||||
msgid "Register to the WEI! – 2A+"
|
msgid "Register to the WEI! – 2A+"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/wei/weiclub_tables.html:67
|
#: templates/wei/weiclub_tables.html:20
|
||||||
msgid "Update my registration"
|
msgid "Update my registration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/wei/weiclub_tables.html:92
|
#: templates/wei/weiclub_tables.html:45
|
||||||
msgid "Members of the WEI"
|
msgid "Members of the WEI"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/wei/weiclub_tables.html:120
|
#: templates/wei/weiclub_tables.html:73
|
||||||
msgid "Unvalidated registrations"
|
msgid "Unvalidated registrations"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -2557,23 +2557,17 @@ msgstr ""
|
||||||
|
|
||||||
#: templates/wei/weimembership_form.html:152
|
#: templates/wei/weimembership_form.html:152
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"The WEI will be paid by Société générale. The membership will be created "
|
||||||
" The WEI will be paid by Société générale. The "
|
"even if the bank didn't pay the BDE yet. The membership transaction will be "
|
||||||
"membership will be created even if the bank didn't pay the BDE yet.\n"
|
"created but will be invalid. You will have to validate it once the bank "
|
||||||
" The membership transaction will be created but "
|
"validated the creation of the account, or to change the payment method."
|
||||||
"will be invalid. You will have to validate it once the bank\n"
|
|
||||||
" validated the creation of the account, or to "
|
|
||||||
"change the payment method.\n"
|
|
||||||
" "
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/wei/weimembership_form.html:162
|
#: templates/wei/weimembership_form.html:162
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"The note don't have enough money (%(balance)s, %(pretty_fee)s required). The "
|
||||||
" The note don't have enough money "
|
"registration may fail."
|
||||||
"(%(balance)s, %(pretty_fee)s required). The registration may fail.\n"
|
|
||||||
" "
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/wei/weimembership_form.html:169
|
#: templates/wei/weimembership_form.html:169
|
||||||
|
@ -2587,15 +2581,10 @@ msgstr ""
|
||||||
#: templates/wei/weimembership_form.html:184
|
#: templates/wei/weimembership_form.html:184
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"This user is not a member of the Kfet club for the comming year. Please "
|
||||||
" This user is not a member of the Kfet club. "
|
"adhere <a href=\"%(future_user_detail)s\">here if he/she is in her/his first "
|
||||||
"Please adhere\n"
|
"year</a> or <a href=\"%(club_detail)s\">here if he/she was an old member</a> "
|
||||||
" <a href=\"%(future_user_detail)s\">here if he/"
|
"before you validate the registration of the WEI."
|
||||||
"she is in her/his first year</a>\n"
|
|
||||||
" or <a href=\"%(club_detail)s\">here if he/she "
|
|
||||||
"was an old member</a> before you validate\n"
|
|
||||||
" the registration of the WEI.\n"
|
|
||||||
" "
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/wei/weimembership_list.html:24
|
#: templates/wei/weimembership_list.html:24
|
||||||
|
|
|
@ -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-03 18:38+0200\n"
|
"POT-Creation-Date: 2020-08-03 23:53+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"
|
||||||
|
@ -545,7 +545,7 @@ msgstr "l'adhésion commence le"
|
||||||
msgid "membership ends on"
|
msgid "membership ends on"
|
||||||
msgstr "l'adhésion finit le"
|
msgstr "l'adhésion finit le"
|
||||||
|
|
||||||
#: apps/member/models.py:310 apps/member/views.py:535 apps/wei/views.py:793
|
#: apps/member/models.py:310 apps/member/views.py:540 apps/wei/views.py:798
|
||||||
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"
|
||||||
|
|
||||||
|
@ -554,7 +554,7 @@ msgstr "L'utilisateur n'est pas membre du club parent"
|
||||||
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:328 apps/member/views.py:544
|
#: apps/member/models.py:328 apps/member/views.py:549
|
||||||
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"
|
||||||
|
|
||||||
|
@ -625,7 +625,7 @@ msgstr "Modifier le club"
|
||||||
msgid "Add new member to the club"
|
msgid "Add new member to the club"
|
||||||
msgstr "Ajouter un nouveau membre au club"
|
msgstr "Ajouter un nouveau membre au club"
|
||||||
|
|
||||||
#: apps/member/views.py:530 apps/wei/views.py:784
|
#: apps/member/views.py:530 apps/wei/views.py:783
|
||||||
msgid ""
|
msgid ""
|
||||||
"This user don't have enough money to join this club, and can't have a "
|
"This user don't have enough money to join this club, and can't have a "
|
||||||
"negative balance."
|
"negative balance."
|
||||||
|
@ -633,25 +633,25 @@ msgstr ""
|
||||||
"Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
|
"Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
|
||||||
"avoir un solde négatif."
|
"avoir un solde négatif."
|
||||||
|
|
||||||
#: apps/member/views.py:548
|
#: apps/member/views.py:553
|
||||||
msgid "The membership must start after {:%m-%d-%Y}."
|
msgid "The membership must start after {:%m-%d-%Y}."
|
||||||
msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
|
msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
|
||||||
|
|
||||||
#: apps/member/views.py:553
|
#: apps/member/views.py:558
|
||||||
msgid "The membership must begin before {:%m-%d-%Y}."
|
msgid "The membership must begin before {:%m-%d-%Y}."
|
||||||
msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
|
msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
|
||||||
|
|
||||||
#: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574
|
#: apps/member/views.py:575 apps/member/views.py:577 apps/member/views.py:579
|
||||||
#: apps/registration/views.py:290 apps/registration/views.py:292
|
#: apps/registration/views.py:290 apps/registration/views.py:292
|
||||||
#: apps/registration/views.py:294
|
#: apps/registration/views.py:294
|
||||||
msgid "This field is required."
|
msgid "This field is required."
|
||||||
msgstr "Ce champ est requis."
|
msgstr "Ce champ est requis."
|
||||||
|
|
||||||
#: apps/member/views.py:642
|
#: apps/member/views.py:647
|
||||||
msgid "Manage roles of an user in the club"
|
msgid "Manage roles of an user in the club"
|
||||||
msgstr "Gérer les rôles d'un utilisateur dans le club"
|
msgstr "Gérer les rôles d'un utilisateur dans le club"
|
||||||
|
|
||||||
#: apps/member/views.py:667
|
#: apps/member/views.py:672
|
||||||
msgid "Members of the club"
|
msgid "Members of the club"
|
||||||
msgstr "Membres du club"
|
msgstr "Membres du club"
|
||||||
|
|
||||||
|
@ -1483,7 +1483,7 @@ msgstr ""
|
||||||
msgid "Bus"
|
msgid "Bus"
|
||||||
msgstr "Bus"
|
msgstr "Bus"
|
||||||
|
|
||||||
#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:79
|
#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:32
|
||||||
msgid "Buses"
|
msgid "Buses"
|
||||||
msgstr "Bus"
|
msgstr "Bus"
|
||||||
|
|
||||||
|
@ -1750,25 +1750,25 @@ msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI."
|
||||||
msgid "Validate WEI registration"
|
msgid "Validate WEI registration"
|
||||||
msgstr "Valider l'inscription WEI"
|
msgstr "Valider l'inscription WEI"
|
||||||
|
|
||||||
#: apps/wei/views.py:788
|
#: apps/wei/views.py:787
|
||||||
msgid "This user didn't give her/his caution check."
|
msgid "This user didn't give her/his caution check."
|
||||||
msgstr "Cet utilisateur n'a pas donné son chèque de caution."
|
msgstr "Cet utilisateur n'a pas donné son chèque de caution."
|
||||||
|
|
||||||
#: apps/wei/views.py:825 apps/wei/views.py:878 apps/wei/views.py:888
|
#: apps/wei/views.py:830 apps/wei/views.py:883 apps/wei/views.py:893
|
||||||
#: templates/wei/survey.html:12 templates/wei/survey_closed.html:12
|
#: templates/wei/survey.html:12 templates/wei/survey_closed.html:12
|
||||||
#: templates/wei/survey_end.html:12
|
#: templates/wei/survey_end.html:12
|
||||||
msgid "Survey WEI"
|
msgid "Survey WEI"
|
||||||
msgstr "Questionnaire WEI"
|
msgstr "Questionnaire WEI"
|
||||||
|
|
||||||
#: note_kfet/settings/base.py:155
|
#: note_kfet/settings/base.py:156
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Allemand"
|
msgstr "Allemand"
|
||||||
|
|
||||||
#: note_kfet/settings/base.py:156
|
#: note_kfet/settings/base.py:157
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Anglais"
|
msgstr "Anglais"
|
||||||
|
|
||||||
#: note_kfet/settings/base.py:157
|
#: note_kfet/settings/base.py:158
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Français"
|
msgstr "Français"
|
||||||
|
|
||||||
|
@ -1981,16 +1981,16 @@ msgstr "Filtrer par rôle :"
|
||||||
msgid "There is no membership found with this pattern."
|
msgid "There is no membership found with this pattern."
|
||||||
msgstr "Il n'y a pas d'adhésion trouvée avec cette entrée."
|
msgstr "Il n'y a pas d'adhésion trouvée avec cette entrée."
|
||||||
|
|
||||||
#: templates/member/club_tables.html:7
|
#: templates/member/club_tables.html:9
|
||||||
msgid "Club managers"
|
msgid "Club managers"
|
||||||
msgstr "Bureau du club"
|
msgstr "Bureau du club"
|
||||||
|
|
||||||
#: templates/member/club_tables.html:20
|
#: templates/member/club_tables.html:22
|
||||||
msgid "Club members"
|
msgid "Club members"
|
||||||
msgstr "Membres du club"
|
msgstr "Membres du club"
|
||||||
|
|
||||||
#: templates/member/club_tables.html:33 templates/member/profile_tables.html:28
|
#: templates/member/club_tables.html:35 templates/member/profile_tables.html:26
|
||||||
#: templates/wei/weiclub_tables.html:105
|
#: templates/wei/weiclub_tables.html:58
|
||||||
msgid "Transaction history"
|
msgid "Transaction history"
|
||||||
msgstr "Historique des transactions"
|
msgstr "Historique des transactions"
|
||||||
|
|
||||||
|
@ -2579,23 +2579,23 @@ msgstr "Voir le WEI"
|
||||||
msgid "WEI listing"
|
msgid "WEI listing"
|
||||||
msgstr "Liste des WEI"
|
msgstr "Liste des WEI"
|
||||||
|
|
||||||
#: templates/wei/weiclub_tables.html:63
|
#: templates/wei/weiclub_tables.html:16
|
||||||
msgid "Register to the WEI! – 1A"
|
msgid "Register to the WEI! – 1A"
|
||||||
msgstr "M'inscrire au WEI ! – 1A"
|
msgstr "M'inscrire au WEI ! – 1A"
|
||||||
|
|
||||||
#: templates/wei/weiclub_tables.html:65
|
#: templates/wei/weiclub_tables.html:18
|
||||||
msgid "Register to the WEI! – 2A+"
|
msgid "Register to the WEI! – 2A+"
|
||||||
msgstr "M'inscrire au WEI ! – 2A+"
|
msgstr "M'inscrire au WEI ! – 2A+"
|
||||||
|
|
||||||
#: templates/wei/weiclub_tables.html:67
|
#: templates/wei/weiclub_tables.html:20
|
||||||
msgid "Update my registration"
|
msgid "Update my registration"
|
||||||
msgstr "Modifier mon inscription"
|
msgstr "Modifier mon inscription"
|
||||||
|
|
||||||
#: templates/wei/weiclub_tables.html:92
|
#: templates/wei/weiclub_tables.html:45
|
||||||
msgid "Members of the WEI"
|
msgid "Members of the WEI"
|
||||||
msgstr "Membres du WEI"
|
msgstr "Membres du WEI"
|
||||||
|
|
||||||
#: templates/wei/weiclub_tables.html:120
|
#: templates/wei/weiclub_tables.html:73
|
||||||
msgid "Unvalidated registrations"
|
msgid "Unvalidated registrations"
|
||||||
msgstr "Inscriptions non validées"
|
msgstr "Inscriptions non validées"
|
||||||
|
|
||||||
|
@ -2666,14 +2666,10 @@ msgstr "avec les rôles suivants :"
|
||||||
|
|
||||||
#: templates/wei/weimembership_form.html:152
|
#: templates/wei/weimembership_form.html:152
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"The WEI will be paid by Société générale. The membership will be created "
|
||||||
" The WEI will be paid by Société générale. The "
|
"even if the bank didn't pay the BDE yet. The membership transaction will be "
|
||||||
"membership will be created even if the bank didn't pay the BDE yet.\n"
|
"created but will be invalid. You will have to validate it once the bank "
|
||||||
" The membership transaction will be created but "
|
"validated the creation of the account, or to change the payment method."
|
||||||
"will be invalid. You will have to validate it once the bank\n"
|
|
||||||
" validated the creation of the account, or to "
|
|
||||||
"change the payment method.\n"
|
|
||||||
" "
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Le WEI va être payé par la Société générale. L'adhésion sera créée même si "
|
"Le WEI va être payé par la Société générale. L'adhésion sera créée même si "
|
||||||
|
@ -2684,12 +2680,9 @@ msgstr ""
|
||||||
" "
|
" "
|
||||||
|
|
||||||
#: templates/wei/weimembership_form.html:162
|
#: templates/wei/weimembership_form.html:162
|
||||||
#, python-format
|
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"The note don't have enough money (%(balance)s, %(pretty_fee)s required). The "
|
||||||
" The note don't have enough money "
|
"registration may fail."
|
||||||
"(%(balance)s, %(pretty_fee)s required). The registration may fail.\n"
|
|
||||||
" "
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"La note n'a pas assez d'argent (%(balance)s, %(pretty_fee)s requis). "
|
"La note n'a pas assez d'argent (%(balance)s, %(pretty_fee)s requis). "
|
||||||
|
@ -2705,20 +2698,14 @@ msgid "The user didn't give her/his caution check."
|
||||||
msgstr "L'utilisateur n'a pas donné son chèque de caution."
|
msgstr "L'utilisateur n'a pas donné son chèque de caution."
|
||||||
|
|
||||||
#: templates/wei/weimembership_form.html:184
|
#: templates/wei/weimembership_form.html:184
|
||||||
#, python-format
|
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"This user is not a member of the Kfet club for the comming year. Please "
|
||||||
" This user is not a member of the Kfet club. "
|
"adhere <a href=\"%(future_user_detail)s\">here if he/she is in her/his first "
|
||||||
"Please adhere\n"
|
"year</a> or <a href=\"%(club_detail)s\">here if he/she was an old member</a> "
|
||||||
" <a href=\"%(future_user_detail)s\">here if he/"
|
"before you validate the registration of the WEI."
|
||||||
"she is in her/his first year</a>\n"
|
|
||||||
" or <a href=\"%(club_detail)s\">here if he/she "
|
|
||||||
"was an old member</a> before you validate\n"
|
|
||||||
" the registration of the WEI.\n"
|
|
||||||
" "
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Cet utilisateur n'est pas membre du club Kfet. Merci de le faire adhérer\n"
|
"Cet utilisateur n'est pas membre du club Kfet pour l'année à venir. Merci de le faire adhérer\n"
|
||||||
"<a href=\"%(future_user_detail)s\">ici s'iel est en première année</a>\n"
|
"<a href=\"%(future_user_detail)s\">ici s'iel est en première année</a>\n"
|
||||||
"ou <a href=\"%(club_detail)s\">ici s'iel est un ancien membre</a> avant de "
|
"ou <a href=\"%(club_detail)s\">ici s'iel est un ancien membre</a> avant de "
|
||||||
"valider\n"
|
"valider\n"
|
||||||
|
@ -2749,6 +2736,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 "Validate a registration"
|
|
||||||
#~ msgstr "Valider l'inscription"
|
|
||||||
|
|
|
@ -149,7 +149,7 @@
|
||||||
{% else %}
|
{% else %}
|
||||||
{% if registration.soge_credit %}
|
{% if registration.soge_credit %}
|
||||||
<div class="alert alert-warning">
|
<div class="alert alert-warning">
|
||||||
{% blocktrans %}
|
{% blocktrans trimmed %}
|
||||||
The WEI will be paid by Société générale. The membership will be created even if the bank didn't pay the BDE yet.
|
The WEI will be paid by Société générale. The membership will be created even if the bank didn't pay the BDE yet.
|
||||||
The membership transaction will be created but will be invalid. You will have to validate it once the bank
|
The membership transaction will be created but will be invalid. You will have to validate it once the bank
|
||||||
validated the creation of the account, or to change the payment method.
|
validated the creation of the account, or to change the payment method.
|
||||||
|
@ -159,7 +159,7 @@
|
||||||
{% if registration.user.note.balance < fee %}
|
{% if registration.user.note.balance < fee %}
|
||||||
<div class="alert alert-danger">
|
<div class="alert alert-danger">
|
||||||
{% with pretty_fee=fee|pretty_money %}
|
{% with pretty_fee=fee|pretty_money %}
|
||||||
{% blocktrans with balance=registration.user.note.balance|pretty_money %}
|
{% blocktrans trimmed with balance=registration.user.note.balance|pretty_money %}
|
||||||
The note don't have enough money ({{ balance }}, {{ pretty_fee }} required). The registration may fail.
|
The note don't have enough money ({{ balance }}, {{ pretty_fee }} required). The registration may fail.
|
||||||
{% endblocktrans %}
|
{% endblocktrans %}
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
|
@ -181,8 +181,8 @@
|
||||||
<div class="alert alert-danger">
|
<div class="alert alert-danger">
|
||||||
{% url 'registration:future_user_detail' pk=registration.user.pk as future_user_detail %}
|
{% url 'registration:future_user_detail' pk=registration.user.pk as future_user_detail %}
|
||||||
{% url 'member:club_detail' pk=club.parent_club.parent_club.pk as club_detail %}
|
{% url 'member:club_detail' pk=club.parent_club.parent_club.pk as club_detail %}
|
||||||
{% blocktrans %}
|
{% blocktrans trimmed %}
|
||||||
This user is not a member of the Kfet club. Please adhere
|
This user is not a member of the Kfet club for the comming year. Please adhere
|
||||||
<a href="{{ future_user_detail }}">here if he/she is in her/his first year</a>
|
<a href="{{ future_user_detail }}">here if he/she is in her/his first year</a>
|
||||||
or <a href="{{ club_detail }}">here if he/she was an old member</a> before you validate
|
or <a href="{{ club_detail }}">here if he/she was an old member</a> before you validate
|
||||||
the registration of the WEI.
|
the registration of the WEI.
|
||||||
|
|
Loading…
Reference in New Issue