diff --git a/apps/registration/forms.py b/apps/registration/forms.py index ff05180c..e26d0786 100644 --- a/apps/registration/forms.py +++ b/apps/registration/forms.py @@ -44,14 +44,14 @@ class SignUpForm(UserCreationForm): fields = ('first_name', 'last_name', 'username', 'email', ) -class DeclareSogeAccountOpenedForm(forms.Form): - soge_account = forms.BooleanField( - label=_("I declare that I opened or I will open soon a bank account in the Société générale with the BDE " - "partnership."), - help_text=_("Warning: this engages you to open your bank account. If you finally decides to don't open your " - "account, you will have to pay the BDE membership."), - required=False, - ) +#class DeclareSogeAccountOpenedForm(forms.Form): +# soge_account = forms.BooleanField( +# label=_("I declare that I opened or I will open soon a bank account in the Société générale with the BDE " +# "partnership."), +# help_text=_("Warning: this engages you to open your bank account. If you finally decides to don't open your " +# "account, you will have to pay the BDE membership."), +# required=False, +# ) class WEISignupForm(forms.Form): @@ -67,11 +67,11 @@ class ValidationForm(forms.Form): """ Validate the inscription of the new users and pay memberships. """ - soge = forms.BooleanField( - label=_("Inscription paid by Société Générale"), - required=False, - help_text=_("Check this case if the Société Générale paid the inscription."), - ) +# soge = forms.BooleanField( +# label=_("Inscription paid by Société Générale"), +# required=False, +# help_text=_("Check this case if the Société Générale paid the inscription."), +# ) credit_type = forms.ModelChoiceField( queryset=NoteSpecial.objects, diff --git a/apps/registration/templates/registration/future_profile_detail.html b/apps/registration/templates/registration/future_profile_detail.html index 577ad219..be0c084f 100644 --- a/apps/registration/templates/registration/future_profile_detail.html +++ b/apps/registration/templates/registration/future_profile_detail.html @@ -57,11 +57,13 @@ SPDX-License-Identifier: GPL-3.0-or-later

{% trans "Validate account" %}

+ {% comment "Soge not for membership (only WEI)" %} {% if declare_soge_account %}
{% trans "The user declared that he/she opened a bank account in the Société générale." %}
{% endif %} + {% endcomment %}
{% csrf_token %} @@ -76,6 +78,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% endblock %} +{% comment "Soge not for membership (only WEI)" %} {% block extrajavascript %} {% endblock %} +{% endcomment %} diff --git a/apps/registration/tests/test_registration.py b/apps/registration/tests/test_registration.py index 8347616d..994cef70 100644 --- a/apps/registration/tests/test_registration.py +++ b/apps/registration/tests/test_registration.py @@ -192,7 +192,7 @@ class TestValidateRegistration(TestCase): # BDE Membership is mandatory response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict( - soge=False, +# soge=False, credit_type=NoteSpecial.objects.get(special_type="Chèque").id, credit_amount=4200, last_name="TOTO", @@ -206,7 +206,7 @@ class TestValidateRegistration(TestCase): # Same response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict( - soge=False, +# soge=False, credit_type="", credit_amount=0, last_name="TOTO", @@ -220,7 +220,7 @@ class TestValidateRegistration(TestCase): # The BDE membership is not free response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict( - soge=False, +# soge=False, credit_type=NoteSpecial.objects.get(special_type="Espèces").id, credit_amount=0, last_name="TOTO", @@ -234,7 +234,7 @@ class TestValidateRegistration(TestCase): # Last and first names are required for a credit response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict( - soge=False, +# soge=False, credit_type=NoteSpecial.objects.get(special_type="Chèque").id, credit_amount=4000, last_name="", @@ -251,7 +251,7 @@ class TestValidateRegistration(TestCase): self.user.username = "admïntoto" self.user.save() response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict( - soge=False, +# soge=False, credit_type=NoteSpecial.objects.get(special_type="Chèque").id, credit_amount=500, last_name="TOTO", @@ -277,7 +277,7 @@ class TestValidateRegistration(TestCase): self.user.profile.save() response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict( - soge=False, +# soge=False, credit_type=NoteSpecial.objects.get(special_type="Chèque").id, credit_amount=500, last_name="TOTO", @@ -314,7 +314,7 @@ class TestValidateRegistration(TestCase): self.user.profile.save() response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict( - soge=False, +# soge=False, credit_type=NoteSpecial.objects.get(special_type="Espèces").id, credit_amount=4000, last_name="TOTO", @@ -337,43 +337,43 @@ class TestValidateRegistration(TestCase): response = self.client.get(self.user.profile.get_absolute_url()) self.assertEqual(response.status_code, 200) - def test_validate_kfet_registration_with_soge(self): - """ - The user joins the BDE and the Kfet, but the membership is paid by the Société générale. - """ - response = self.client.get(reverse("registration:future_user_detail", args=(self.user.pk,))) - self.assertEqual(response.status_code, 200) - - response = self.client.get(self.user.profile.get_absolute_url()) - self.assertEqual(response.status_code, 404) - - self.user.profile.email_confirmed = True - self.user.profile.save() - - response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict( - soge=True, - credit_type=NoteSpecial.objects.get(special_type="Espèces").id, - credit_amount=4000, - last_name="TOTO", - first_name="Toto", - bank="Société générale", - join_bde=True, - join_kfet=True, - )) - self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200) - self.user.profile.refresh_from_db() - self.assertTrue(self.user.profile.registration_valid) - self.assertTrue(NoteUser.objects.filter(user=self.user).exists()) - self.assertTrue(Membership.objects.filter(club__name="BDE", user=self.user).exists()) - self.assertTrue(Membership.objects.filter(club__name="Kfet", user=self.user).exists()) - self.assertFalse(Membership.objects.filter(club__name__iexact="BDA", user=self.user).exists()) - self.assertTrue(SogeCredit.objects.filter(user=self.user).exists()) - self.assertEqual(Transaction.objects.filter( - Q(source=self.user.note) | Q(destination=self.user.note)).count(), 3) - self.assertFalse(Transaction.objects.filter(valid=True).exists()) - - response = self.client.get(self.user.profile.get_absolute_url()) - self.assertEqual(response.status_code, 200) +# def test_validate_kfet_registration_with_soge(self): +# """ +# The user joins the BDE and the Kfet, but the membership is paid by the Société générale. +# """ +# response = self.client.get(reverse("registration:future_user_detail", args=(self.user.pk,))) +# self.assertEqual(response.status_code, 200) +# +# response = self.client.get(self.user.profile.get_absolute_url()) +# self.assertEqual(response.status_code, 404) +# +# self.user.profile.email_confirmed = True +# self.user.profile.save() +# +# response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict( +# soge=True, +# credit_type=NoteSpecial.objects.get(special_type="Espèces").id, +# credit_amount=4000, +# last_name="TOTO", +# first_name="Toto", +# bank="Société générale", +# join_bde=True, +# join_kfet=True, +# )) +# self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200) +# self.user.profile.refresh_from_db() +# self.assertTrue(self.user.profile.registration_valid) +# self.assertTrue(NoteUser.objects.filter(user=self.user).exists()) +# self.assertTrue(Membership.objects.filter(club__name="BDE", user=self.user).exists()) +# self.assertTrue(Membership.objects.filter(club__name="Kfet", user=self.user).exists()) +# self.assertFalse(Membership.objects.filter(club__name__iexact="BDA", user=self.user).exists()) +# self.assertTrue(SogeCredit.objects.filter(user=self.user).exists()) +# self.assertEqual(Transaction.objects.filter( +# Q(source=self.user.note) | Q(destination=self.user.note)).count(), 3) +# self.assertFalse(Transaction.objects.filter(valid=True).exists()) +# +# response = self.client.get(self.user.profile.get_absolute_url()) +# self.assertEqual(response.status_code, 200) def test_invalidate_registration(self): """ diff --git a/apps/registration/views.py b/apps/registration/views.py index 1ac49974..53b3d066 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -24,7 +24,8 @@ from permission.models import Role from permission.views import ProtectQuerysetMixin from treasury.models import SogeCredit -from .forms import SignUpForm, ValidationForm, DeclareSogeAccountOpenedForm +#from .forms import SignUpForm, ValidationForm, DeclareSogeAccountOpenedForm +from .forms import SignUpForm, ValidationForm from .tables import FutureUserTable from .tokens import email_validation_token @@ -42,7 +43,7 @@ class UserCreateView(CreateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context["profile_form"] = self.second_form(self.request.POST if self.request.POST else None) - context["soge_form"] = DeclareSogeAccountOpenedForm(self.request.POST if self.request.POST else None) +# context["soge_form"] = DeclareSogeAccountOpenedForm(self.request.POST if self.request.POST else None) del context["profile_form"].fields["section"] del context["profile_form"].fields["report_frequency"] del context["profile_form"].fields["last_report"] @@ -75,12 +76,12 @@ class UserCreateView(CreateView): user.profile.send_email_validation_link() - soge_form = DeclareSogeAccountOpenedForm(self.request.POST) - if "soge_account" in soge_form.data and soge_form.data["soge_account"]: - # If the user declares that a bank account got opened, prepare the soge credit to warn treasurers - soge_credit = SogeCredit(user=user) - soge_credit._force_save = True - soge_credit.save() +# soge_form = DeclareSogeAccountOpenedForm(self.request.POST) +# if "soge_account" in soge_form.data and soge_form.data["soge_account"]: +# # If the user declares that a bank account got opened, prepare the soge credit to warn treasurers +# soge_credit = SogeCredit(user=user) +# soge_credit._force_save = True +# soge_credit.save() return super().form_valid(form) @@ -242,7 +243,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, fee += bda.membership_fee_paid if user.profile.paid else bda.membership_fee_unpaid ctx["total_fee"] = "{:.02f}".format(fee / 100, ) - ctx["declare_soge_account"] = SogeCredit.objects.filter(user=user).exists() +# ctx["declare_soge_account"] = SogeCredit.objects.filter(user=user).exists() return ctx @@ -271,7 +272,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, bda_exists = True # Get form data - soge = form.cleaned_data["soge"] +# soge = form.cleaned_data["soge"] credit_type = form.cleaned_data["credit_type"] credit_amount = form.cleaned_data["credit_amount"] last_name = form.cleaned_data["last_name"] @@ -282,10 +283,10 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, if bda_exists: join_bda = form.cleaned_data["join_bda"] - if soge: - # If Société Générale pays the inscription, the user automatically joins the two clubs. - join_bde = True - join_kfet = True +# if soge: +# # If Société Générale pays the inscription, the user automatically joins the two clubs. +# join_bde = True +# join_kfet = True if not join_bde: # This software belongs to the BDE. @@ -308,14 +309,15 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, # Add extra fee for the bda membership fee += bda_fee if join_bda else 0 - # If the bank pays, then we don't credit now. Treasurers will validate the transaction - # and credit the note later. - credit_type = None if soge else credit_type +# # If the bank pays, then we don't credit now. Treasurers will validate the transaction +# # and credit the note later. +# credit_type = None if soge else credit_type # If the user does not select any payment method, then no credit will be performed. credit_amount = 0 if credit_type is None else credit_amount - if fee > credit_amount and not soge: + if fee > credit_amount: +# if fee > credit_amount and not soge: # Check if the user credits enough money form.add_error('credit_type', _("The entered amount is not enough for the memberships, should be at least {}") @@ -335,12 +337,12 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, user.profile.save() user.refresh_from_db() - if not soge and SogeCredit.objects.filter(user=user).exists(): - # If the user declared that a bank account was opened but in the validation form the SoGé case was - # unchecked, delete the associated credit - soge_credit = SogeCredit.objects.get(user=user) - soge_credit._force_delete = True - soge_credit.delete() +# if not soge and SogeCredit.objects.filter(user=user).exists(): +# # If the user declared that a bank account was opened but in the validation form the SoGé case was +# # unchecked, delete the associated credit +# soge_credit = SogeCredit.objects.get(user=user) +# soge_credit._force_delete = True +# soge_credit.delete() if credit_type is not None and credit_amount > 0: # Credit the note @@ -349,7 +351,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, destination=user.note, quantity=1, amount=credit_amount, - reason="Crédit " + ("Société générale" if soge else credit_type.special_type) + " (Inscription)", + reason="Crédit " + credit_type.special_type + " (Inscription)", +# reason="Crédit " + ("Société générale" if soge else credit_type.special_type) + " (Inscription)", last_name=last_name, first_name=first_name, bank=bank, @@ -363,8 +366,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, user=user, fee=bde_fee, ) - if soge: - membership._soge = True +# if soge: +# membership._soge = True membership.save() membership.refresh_from_db() membership.roles.add(Role.objects.get(name="Adhérent BDE")) @@ -377,8 +380,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, user=user, fee=kfet_fee, ) - if soge: - membership._soge = True +# if soge: +# membership._soge = True membership.save() membership.refresh_from_db() membership.roles.add(Role.objects.get(name="Adhérent Kfet")) @@ -396,10 +399,10 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, membership.roles.add(Role.objects.get(name="Membre de club")) membership.save() - if soge: - soge_credit = SogeCredit.objects.get(user=user) - # Update the credit transaction amount - soge_credit.save() +# if soge: +# soge_credit = SogeCredit.objects.get(user=user) +# # Update the credit transaction amount +# soge_credit.save() return ret diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index a76be161..65d59fbd 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-04 17:30+0200\n" +"POT-Creation-Date: 2023-07-07 21:25+0200\n" "PO-Revision-Date: 2020-11-16 20:02+0000\n" "Last-Translator: bleizi \n" "Language-Team: German \n" @@ -549,15 +549,15 @@ msgid "This image cannot be loaded." msgstr "Dieses Bild kann nicht geladen werden." #: apps/member/forms.py:141 apps/member/views.py:103 -#: apps/registration/forms.py:33 apps/registration/views.py:265 +#: apps/registration/forms.py:33 apps/registration/views.py:266 msgid "An alias with a similar name already exists." msgstr "Ein ähnliches Alias ist schon benutzt." -#: apps/member/forms.py:165 apps/registration/forms.py:71 +#: apps/member/forms.py:165 msgid "Inscription paid by Société Générale" msgstr "Mitgliedschaft von der Société Générale bezahlt" -#: apps/member/forms.py:167 apps/registration/forms.py:73 +#: apps/member/forms.py:167 msgid "Check this case if the Société Générale paid the inscription." msgstr "Die Société Générale die Mitgliedschaft bezahlt." @@ -1249,11 +1249,11 @@ msgstr "Die Mitgliedschaft muss nach {:%m-%d-Y} anfängen." msgid "The membership must begin before {:%m-%d-%Y}." msgstr "Die Mitgliedschaft muss vor {:%m-%d-Y} anfängen." -#: apps/member/views.py:876 +#: apps/member/views.py:880 msgid "Manage roles of an user in the club" msgstr "Rollen in diesen Club bearbeiten" -#: apps/member/views.py:901 +#: apps/member/views.py:905 msgid "Members of the club" msgstr "Mitlglieder dieses Club" @@ -1986,20 +1986,6 @@ msgstr "Anmeldung" msgid "This email address is already used." msgstr "Diese email adresse ist schon benutzt." -#: apps/registration/forms.py:49 -#, fuzzy -#| msgid "You already opened an account in the Société générale." -msgid "" -"I declare that I opened or I will open soon a bank account in the Société " -"générale with the BDE partnership." -msgstr "Sie haben bereits ein Konto in der Société générale eröffnet." - -#: apps/registration/forms.py:51 -msgid "" -"Warning: this engages you to open your bank account. If you finally decides " -"to don't open your account, you will have to pay the BDE membership." -msgstr "" - #: apps/registration/forms.py:59 msgid "Register to the WEI" msgstr "Zu WEI anmelden" @@ -2073,14 +2059,14 @@ msgstr "Registrierung löschen" msgid "Validate account" msgstr "Konto validieren" -#: apps/registration/templates/registration/future_profile_detail.html:62 +#: apps/registration/templates/registration/future_profile_detail.html:63 #, fuzzy #| msgid "You already opened an account in the Société générale." msgid "" "The user declared that he/she opened a bank account in the Société générale." msgstr "Sie haben bereits ein Konto in der Société générale eröffnet." -#: apps/registration/templates/registration/future_profile_detail.html:71 +#: apps/registration/templates/registration/future_profile_detail.html:73 #: apps/wei/templates/wei/weimembership_form.html:127 #: apps/wei/templates/wei/weimembership_form.html:186 msgid "Validate registration" @@ -2132,54 +2118,54 @@ msgstr "Danke" msgid "The Note Kfet team." msgstr "Die NoteKfet Team." -#: apps/registration/views.py:40 +#: apps/registration/views.py:41 msgid "Register new user" msgstr "Neuen User registrieren" -#: apps/registration/views.py:98 +#: apps/registration/views.py:99 msgid "Email validation" msgstr "Email validierung" -#: apps/registration/views.py:100 +#: apps/registration/views.py:101 msgid "Validate email" msgstr "Email validieren" -#: apps/registration/views.py:144 +#: apps/registration/views.py:145 msgid "Email validation unsuccessful" msgstr "Email validierung unerfolgreich" -#: apps/registration/views.py:155 +#: apps/registration/views.py:156 msgid "Email validation email sent" msgstr "Validierungsemail wurde gesendet" -#: apps/registration/views.py:163 +#: apps/registration/views.py:164 msgid "Resend email validation link" msgstr "E-Mail-Validierungslink erneut senden" -#: apps/registration/views.py:181 +#: apps/registration/views.py:182 msgid "Pre-registered users list" msgstr "Vorregistrierte Userliste" -#: apps/registration/views.py:205 +#: apps/registration/views.py:206 msgid "Unregistered users" msgstr "Unregistrierte Users" -#: apps/registration/views.py:218 +#: apps/registration/views.py:219 msgid "Registration detail" msgstr "Registrierung Detailen" -#: apps/registration/views.py:292 +#: apps/registration/views.py:293 msgid "You must join the BDE." msgstr "Sie müssen die BDE beitreten." -#: apps/registration/views.py:321 +#: apps/registration/views.py:323 msgid "" "The entered amount is not enough for the memberships, should be at least {}" msgstr "" "Der eingegebene Betrag reicht für die Mitgliedschaft nicht aus, sollte " "mindestens {} betragen" -#: apps/registration/views.py:414 +#: apps/registration/views.py:417 msgid "Invalidate pre-registration" msgstr "Ungültige Vorregistrierung" @@ -3616,8 +3602,12 @@ msgstr "" "müssen Ihre E-Mail-Adresse auch überprüfen, indem Sie dem Link folgen, den " "Sie erhalten haben." -#~ msgid "Join bda Club" -#~ msgstr "Bda Mitglieder werden" +#, fuzzy +#~| msgid "You already opened an account in the Société générale." +#~ msgid "" +#~ "I declare that I opened or I will open soon a bank account in the Société " +#~ "générale with the BDE partnership." +#~ msgstr "Sie haben bereits ein Konto in der Société générale eröffnet." #~ msgid "This user didn't give her/his caution check." #~ msgstr "Dieser User hat seine / ihre Vorsicht nicht überprüft." diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 44f8edd5..9092612c 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-04 17:30+0200\n" +"POT-Creation-Date: 2023-07-07 21:25+0200\n" "PO-Revision-Date: 2022-04-11 23:12+0200\n" "Last-Translator: bleizi \n" "Language-Team: \n" @@ -546,15 +546,15 @@ msgid "This image cannot be loaded." msgstr "Esta imagen no puede ser cargada." #: apps/member/forms.py:141 apps/member/views.py:103 -#: apps/registration/forms.py:33 apps/registration/views.py:265 +#: apps/registration/forms.py:33 apps/registration/views.py:266 msgid "An alias with a similar name already exists." msgstr "Un alias similar ya existe." -#: apps/member/forms.py:165 apps/registration/forms.py:71 +#: apps/member/forms.py:165 msgid "Inscription paid by Société Générale" msgstr "Registración pagadas por Société Générale" -#: apps/member/forms.py:167 apps/registration/forms.py:73 +#: apps/member/forms.py:167 msgid "Check this case if the Société Générale paid the inscription." msgstr "Marcar esta casilla si Société Générale pagó la registración." @@ -1236,11 +1236,11 @@ msgstr "La afiliación tiene que empezar después del {:%d-%m-%Y}." msgid "The membership must begin before {:%m-%d-%Y}." msgstr "La afiliación tiene que empezar antes del {:%d-%m-%Y}." -#: apps/member/views.py:876 +#: apps/member/views.py:880 msgid "Manage roles of an user in the club" msgstr "Gestionar los papeles de un usuario en el club" -#: apps/member/views.py:901 +#: apps/member/views.py:905 msgid "Members of the club" msgstr "Miembros del club" @@ -1967,22 +1967,6 @@ msgstr "afiliación" msgid "This email address is already used." msgstr "Este correo electrónico ya esta utilizado." -#: apps/registration/forms.py:49 -msgid "" -"I declare that I opened or I will open soon a bank account in the Société " -"générale with the BDE partnership." -msgstr "" -"Declaro que ya abrió una cuenta a la Société Générale en colaboración con el " -"BDE." - -#: apps/registration/forms.py:51 -msgid "" -"Warning: this engages you to open your bank account. If you finally decides " -"to don't open your account, you will have to pay the BDE membership." -msgstr "" -"Cuidado : esto le obliga abrir su cuenta bancaria. Si cambia de idea y no " -"abre su cuenta bancaria, tendrá que pagar su afiliación al BDE." - #: apps/registration/forms.py:59 msgid "Register to the WEI" msgstr "Registrarse en el WEI" @@ -2055,12 +2039,12 @@ msgstr "Suprimir afiliación" msgid "Validate account" msgstr "Validar la cuenta" -#: apps/registration/templates/registration/future_profile_detail.html:62 +#: apps/registration/templates/registration/future_profile_detail.html:63 msgid "" "The user declared that he/she opened a bank account in the Société générale." msgstr "El usuario declara que ya abrió una cuenta a la Société Générale." -#: apps/registration/templates/registration/future_profile_detail.html:71 +#: apps/registration/templates/registration/future_profile_detail.html:73 #: apps/wei/templates/wei/weimembership_form.html:127 #: apps/wei/templates/wei/weimembership_form.html:186 msgid "Validate registration" @@ -2112,54 +2096,54 @@ msgstr "Gracias" msgid "The Note Kfet team." msgstr "El equipo Note Kfet." -#: apps/registration/views.py:40 +#: apps/registration/views.py:41 msgid "Register new user" msgstr "Registrar un nuevo usuario" -#: apps/registration/views.py:98 +#: apps/registration/views.py:99 msgid "Email validation" msgstr "Validación del correo electrónico" -#: apps/registration/views.py:100 +#: apps/registration/views.py:101 msgid "Validate email" msgstr "Validar el correo electrónico" -#: apps/registration/views.py:144 +#: apps/registration/views.py:145 msgid "Email validation unsuccessful" msgstr "La validación del correo electrónico fracasó" -#: apps/registration/views.py:155 +#: apps/registration/views.py:156 msgid "Email validation email sent" msgstr "Correo de validación enviado" -#: apps/registration/views.py:163 +#: apps/registration/views.py:164 msgid "Resend email validation link" msgstr "Reenviar el enlace de validación" -#: apps/registration/views.py:181 +#: apps/registration/views.py:182 msgid "Pre-registered users list" msgstr "Lista de los usuarios con afiliación pendiente" -#: apps/registration/views.py:205 +#: apps/registration/views.py:206 msgid "Unregistered users" msgstr "Usuarios con afiliación pendiente" -#: apps/registration/views.py:218 +#: apps/registration/views.py:219 msgid "Registration detail" msgstr "Detalles de la afiliación" -#: apps/registration/views.py:292 +#: apps/registration/views.py:293 msgid "You must join the BDE." msgstr "Usted tiene que afiliarse al BDE." -#: apps/registration/views.py:321 +#: apps/registration/views.py:323 msgid "" "The entered amount is not enough for the memberships, should be at least {}" msgstr "" "El monto dado no es suficiente para las afiliaciones, tiene que ser al menos " "{}" -#: apps/registration/views.py:414 +#: apps/registration/views.py:417 msgid "Invalidate pre-registration" msgstr "Invalidar la afiliación" @@ -3545,8 +3529,20 @@ msgstr "" "pagar su afiliación. Tambien tiene que validar su correo electronico con el " "enlace que recibió." -#~ msgid "Join bda Club" -#~ msgstr "Afiliarse al club bda" +#~ msgid "" +#~ "I declare that I opened or I will open soon a bank account in the Société " +#~ "générale with the BDE partnership." +#~ msgstr "" +#~ "Declaro que ya abrió una cuenta a la Société Générale en colaboración con " +#~ "el BDE." + +#~ msgid "" +#~ "Warning: this engages you to open your bank account. If you finally " +#~ "decides to don't open your account, you will have to pay the BDE " +#~ "membership." +#~ msgstr "" +#~ "Cuidado : esto le obliga abrir su cuenta bancaria. Si cambia de idea y no " +#~ "abre su cuenta bancaria, tendrá que pagar su afiliación al BDE." #~ msgid "You are not a Kfet member, so you can't use your note account." #~ msgstr "Usted no es un miembro de la Kfet, no puede usar su cuenta note." diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index d87031ea..3c9be6f9 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-04 17:30+0200\n" +"POT-Creation-Date: 2023-07-07 21:25+0200\n" "PO-Revision-Date: 2022-04-11 22:05+0200\n" "Last-Translator: bleizi \n" "Language-Team: French \n" @@ -548,15 +548,15 @@ msgid "This image cannot be loaded." msgstr "Cette image ne peut pas être chargée." #: apps/member/forms.py:141 apps/member/views.py:103 -#: apps/registration/forms.py:33 apps/registration/views.py:265 +#: apps/registration/forms.py:33 apps/registration/views.py:266 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/forms.py:165 apps/registration/forms.py:71 +#: apps/member/forms.py:165 msgid "Inscription paid by Société Générale" msgstr "Inscription payée par la Société générale" -#: apps/member/forms.py:167 apps/registration/forms.py:73 +#: apps/member/forms.py:167 msgid "Check this case if the Société Générale paid the inscription." msgstr "Cochez cette case si la Société Générale a payé l'inscription." @@ -1239,11 +1239,11 @@ msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}." msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:876 +#: apps/member/views.py:880 msgid "Manage roles of an user in the club" msgstr "Gérer les rôles d'un utilisateur dans le club" -#: apps/member/views.py:901 +#: apps/member/views.py:905 msgid "Members of the club" msgstr "Membres du club" @@ -1976,22 +1976,6 @@ msgstr "inscription" msgid "This email address is already used." msgstr "Cet email est déjà pris." -#: apps/registration/forms.py:49 -msgid "" -"I declare that I opened or I will open soon a bank account in the Société " -"générale with the BDE partnership." -msgstr "" -"Je déclare avoir ouvert ou ouvrir prochainement un compte à la société " -"générale avec le partenariat du BDE." - -#: apps/registration/forms.py:51 -msgid "" -"Warning: this engages you to open your bank account. If you finally decides " -"to don't open your account, you will have to pay the BDE membership." -msgstr "" -"Attention : cocher cette case vous engage à ouvrir votre compte. Si vous " -"décidez de ne pas le faire, vous devrez payer l'adhésion au BDE." - #: apps/registration/forms.py:59 msgid "Register to the WEI" msgstr "S'inscrire au WEI" @@ -2065,12 +2049,12 @@ msgstr "Supprimer l'inscription" msgid "Validate account" msgstr "Valider le compte" -#: apps/registration/templates/registration/future_profile_detail.html:62 +#: apps/registration/templates/registration/future_profile_detail.html:63 msgid "" "The user declared that he/she opened a bank account in the Société générale." msgstr "L'utilisateur a déclaré avoir ouvert un compte à la société générale." -#: apps/registration/templates/registration/future_profile_detail.html:71 +#: apps/registration/templates/registration/future_profile_detail.html:73 #: apps/wei/templates/wei/weimembership_form.html:127 #: apps/wei/templates/wei/weimembership_form.html:186 msgid "Validate registration" @@ -2120,54 +2104,54 @@ msgstr "Merci" msgid "The Note Kfet team." msgstr "L'équipe de la Note Kfet." -#: apps/registration/views.py:40 +#: apps/registration/views.py:41 msgid "Register new user" msgstr "Enregistrer un nouvel utilisateur" -#: apps/registration/views.py:98 +#: apps/registration/views.py:99 msgid "Email validation" msgstr "Validation de l'adresse mail" -#: apps/registration/views.py:100 +#: apps/registration/views.py:101 msgid "Validate email" msgstr "Valider l'adresse e-mail" -#: apps/registration/views.py:144 +#: apps/registration/views.py:145 msgid "Email validation unsuccessful" msgstr "La validation de l'adresse mail a échoué" -#: apps/registration/views.py:155 +#: apps/registration/views.py:156 msgid "Email validation email sent" msgstr "L'email de vérification de l'adresse email a bien été envoyé" -#: apps/registration/views.py:163 +#: apps/registration/views.py:164 msgid "Resend email validation link" msgstr "Renvoyer le lien de validation" -#: apps/registration/views.py:181 +#: apps/registration/views.py:182 msgid "Pre-registered users list" msgstr "Liste des utilisateurs en attente d'inscription" -#: apps/registration/views.py:205 +#: apps/registration/views.py:206 msgid "Unregistered users" msgstr "Utilisateurs en attente d'inscription" -#: apps/registration/views.py:218 +#: apps/registration/views.py:219 msgid "Registration detail" msgstr "Détails de l'inscription" -#: apps/registration/views.py:292 +#: apps/registration/views.py:293 msgid "You must join the BDE." msgstr "Vous devez adhérer au BDE." -#: apps/registration/views.py:321 +#: apps/registration/views.py:323 msgid "" "The entered amount is not enough for the memberships, should be at least {}" msgstr "" "Le montant crédité est trop faible pour adhérer, il doit être au minimum de " "{}" -#: apps/registration/views.py:414 +#: apps/registration/views.py:417 msgid "Invalidate pre-registration" msgstr "Invalider l'inscription" @@ -3571,5 +3555,17 @@ msgstr "" "d'adhésion. Vous devez également valider votre adresse email en suivant le " "lien que vous avez reçu." -#~ msgid "Join bda Club" -#~ msgstr "Adhérer au club bda" +#~ msgid "" +#~ "I declare that I opened or I will open soon a bank account in the Société " +#~ "générale with the BDE partnership." +#~ msgstr "" +#~ "Je déclare avoir ouvert ou ouvrir prochainement un compte à la société " +#~ "générale avec le partenariat du BDE." + +#~ msgid "" +#~ "Warning: this engages you to open your bank account. If you finally " +#~ "decides to don't open your account, you will have to pay the BDE " +#~ "membership." +#~ msgstr "" +#~ "Attention : cocher cette case vous engage à ouvrir votre compte. Si vous " +#~ "décidez de ne pas le faire, vous devrez payer l'adhésion au BDE."