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

Some OTL, but so much remain

This commit is contained in:
elkmaennchen 2020-09-13 12:40:10 +02:00
parent f3f18bc25e
commit 5b02ba48e0
5 changed files with 67 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/member/forms.py
View File

@ -161,7 +161,7 @@ class MembershipForm(forms.ModelForm):
soge = forms.BooleanField( soge = forms.BooleanField(
label=_("Inscription paid by Société Générale"), label=_("Inscription paid by Société Générale"),
required=False, required=False,
help_text=_("Check this case is the Société Générale paid the inscription."), help_text=_("Check this case if the Société Générale paid the inscription."),
) )
credit_type = forms.ModelChoiceField( credit_type = forms.ModelChoiceField(

2
apps/wei/models.py
View File

@ -238,7 +238,7 @@ class WEIRegistration(models.Model):
information_json = models.TextField( information_json = models.TextField(
default="{}", default="{}",
verbose_name=_("registration information"), verbose_name=_("registration information"),
help_text=_("Information about the registration (buses for old members, survey fot the new members), " help_text=_("Information about the registration (buses for old members, survey for the new members), "
"encoded in JSON"), "encoded in JSON"),
) )

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

@ -7,9 +7,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-09 14:09+0200\n" "POT-Creation-Date: 2020-09-13 12:35+0200\n"
"PO-Revision-Date: 2020-09-03 23:47+0200\n" "PO-Revision-Date: 2020-09-13 12:39+0200\n"
"Last-Translator: \n" "Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: de\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -533,7 +533,7 @@ msgid "Inscription paid by Société Générale"
msgstr "Mitgliedschaft von der Société Générale bezahlt" msgstr "Mitgliedschaft von der Société Générale bezahlt"
#: apps/member/forms.py:164 apps/registration/forms.py:63 #: apps/member/forms.py:164 apps/registration/forms.py:63
msgid "Check this case is the Société Générale paid the inscription." msgid "Check this case if the Société Générale paid the inscription."
msgstr "Die Société Générale die Mitgliedschaft bezahlt." msgstr "Die Société Générale die Mitgliedschaft bezahlt."
#: apps/member/forms.py:169 apps/registration/forms.py:68 #: apps/member/forms.py:169 apps/registration/forms.py:68
@ -1806,10 +1806,6 @@ msgstr ""
"falls Zweifel, können Sie sich später nach Bestätigung Ihres Kontos im Kfet " "falls Zweifel, können Sie sich später nach Bestätigung Ihres Kontos im Kfet "
"registrieren." "registrieren."
#: apps/registration/forms.py:63
msgid "Check this case if the Société Générale paid the inscription."
msgstr "Die Société Générale die Mitgliedschaft bezahlt."
#: apps/registration/forms.py:96 #: apps/registration/forms.py:96
msgid "Join BDE Club" msgid "Join BDE Club"
msgstr "BDE Mitglieder werden" msgstr "BDE Mitglieder werden"
@ -2111,7 +2107,7 @@ msgstr "spezielle Transaktion Proxies"
msgid "credit transaction" msgid "credit transaction"
msgstr "Kredit Transaktion" msgstr "Kredit Transaktion"
#: apps/treasury/models.py:360 #: apps/treasury/models.py:361
msgid "" msgid ""
"This user doesn't have enough money to pay the memberships with its note. " "This user doesn't have enough money to pay the memberships with its note. "
"Please ask her/him to credit the note before invalidating this credit." "Please ask her/him to credit the note before invalidating this credit."
@ -2119,16 +2115,16 @@ msgstr ""
"Dieser Benutzer hat nicht genug Geld, um die Mitgliedschaften mit seiner " "Dieser Benutzer hat nicht genug Geld, um die Mitgliedschaften mit seiner "
"Note zu bezahlen." "Note zu bezahlen."
#: apps/treasury/models.py:375 #: apps/treasury/models.py:376
#: apps/treasury/templates/treasury/sogecredit_detail.html:10 #: apps/treasury/templates/treasury/sogecredit_detail.html:10
msgid "Credit from the Société générale" msgid "Credit from the Société générale"
msgstr "Kredit von der Société générale" msgstr "Kredit von der Société générale"
#: apps/treasury/models.py:376 #: apps/treasury/models.py:377
msgid "Credits from the Société générale" msgid "Credits from the Société générale"
msgstr "Krediten von der Société générale" msgstr "Krediten von der Société générale"
#: apps/treasury/models.py:379 #: apps/treasury/models.py:380
#, python-brace-format #, python-brace-format
msgid "Soge credit for {user}" msgid "Soge credit for {user}"
msgstr "Kredit von der Société générale für {user}" msgstr "Kredit von der Société générale für {user}"
@ -2528,7 +2524,7 @@ msgstr "Registrierung Detailen"
#: apps/wei/models.py:241 #: apps/wei/models.py:241
msgid "" msgid ""
"Information about the registration (buses for old members, survey fot the " "Information about the registration (buses for old members, survey for the "
"new members), encoded in JSON" "new members), encoded in JSON"
msgstr "" msgstr ""
"Informationen zur Registrierung (Busse für alte Mitglieder, Umfrage für neue " "Informationen zur Registrierung (Busse für alte Mitglieder, Umfrage für neue "
@ -2916,6 +2912,10 @@ msgid "English"
msgstr "English" msgstr "English"
#: note_kfet/settings/base.py:157 #: note_kfet/settings/base.py:157
msgid "Spanish"
msgstr "Spanisch"
#: note_kfet/settings/base.py:158
msgid "French" msgid "French"
msgstr "Französich" msgstr "Französich"
@ -3161,3 +3161,6 @@ msgstr ""
"können. Sie müssen zum Kfet gehen und die Registrierungbeitrag bezahlen. Sie " "können. Sie müssen zum Kfet gehen und die Registrierungbeitrag bezahlen. Sie "
"müssen Ihre E-Mail-Adresse auch überprüfen, indem Sie dem Link folgen, den " "müssen Ihre E-Mail-Adresse auch überprüfen, indem Sie dem Link folgen, den "
"Sie erhalten haben." "Sie erhalten haben."
#~ msgid "Check this case is the Société Générale paid the inscription."
#~ msgstr "Die Société Générale die Mitgliedschaft bezahlt."

61
locale/es/LC_MESSAGES/django.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-04 20:11+0200\n" "POT-Creation-Date: 2020-09-13 12:35+0200\n"
"PO-Revision-Date: 2020-09-13 12:13+0200\n" "PO-Revision-Date: 2020-09-13 12:38+0200\n"
"Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n" "Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: es\n" "Language: es\n"
@ -41,7 +41,7 @@ msgstr "Esta persona ya fue invitada 5 veces este año."
#: apps/activity/forms.py:93 apps/activity/models.py:283 #: apps/activity/forms.py:93 apps/activity/models.py:283
msgid "This person is already invited." msgid "This person is already invited."
msgstr "Esta persona ya esta invitada." msgstr "Esta persona ya está invitada."
#: apps/activity/forms.py:97 apps/activity/models.py:287 #: apps/activity/forms.py:97 apps/activity/models.py:287
msgid "You can't invite more than 3 people to this activity." msgid "You can't invite more than 3 people to this activity."
@ -124,7 +124,7 @@ msgstr "organizador"
#: apps/activity/models.py:97 #: apps/activity/models.py:97
msgid "Club that organizes the activity. The entry fees will go to this club." msgid "Club that organizes the activity. The entry fees will go to this club."
msgstr "" msgstr ""
"El club que organiza la actividad. Los pagos de entrada serán datos a este " "El club que organiza la actividad. Los pagos de entrada serán dados a este "
"club." "club."
#: apps/activity/models.py:104 #: apps/activity/models.py:104
@ -231,7 +231,7 @@ msgstr "Invitación"
#: apps/activity/tables.py:25 #: apps/activity/tables.py:25
msgid "The activity is currently open." msgid "The activity is currently open."
msgstr "La actividad esta actualmente abierta." msgstr "La actividad está actualmente abierta."
#: apps/activity/tables.py:26 #: apps/activity/tables.py:26
msgid "The validation of the activity is pending." msgid "The validation of the activity is pending."
@ -534,7 +534,7 @@ msgid "Inscription paid by Société Générale"
msgstr "Registración pagadas por Société Générale" msgstr "Registración pagadas por Société Générale"
#: apps/member/forms.py:164 apps/registration/forms.py:63 #: apps/member/forms.py:164 apps/registration/forms.py:63
msgid "Check this case is the Société Générale paid the inscription." 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." msgstr "Marcar esta casilla si Société Générale pagó la registración."
#: apps/member/forms.py:169 apps/registration/forms.py:68 #: apps/member/forms.py:169 apps/registration/forms.py:68
@ -1454,6 +1454,11 @@ msgstr "Suprimir"
msgid "Edit" msgid "Edit"
msgstr "Editar" msgstr "Editar"
#: apps/note/templates/note/conso_form.html:22
#: apps/note/templates/note/transaction_form.html:44
msgid "Please select a note"
msgstr "Por favor elige una note"
#: apps/note/templates/note/conso_form.html:32 #: apps/note/templates/note/conso_form.html:32
msgid "Consum" msgid "Consum"
msgstr "Consumir" msgstr "Consumir"
@ -1464,11 +1469,11 @@ msgstr "Consumir"
msgid "Name or alias..." msgid "Name or alias..."
msgstr "Nombre o alias..." msgstr "Nombre o alias..."
#: apps/note/templates/note/conso_form.html:52 #: apps/note/templates/note/conso_form.html:53
msgid "Select consumptions" msgid "Select consumptions"
msgstr "Escoger consumiciones" msgstr "Escoger consumiciones"
#: apps/note/templates/note/conso_form.html:61 #: apps/note/templates/note/conso_form.html:62
msgid "Consume!" msgid "Consume!"
msgstr "¡ Consumir !" msgstr "¡ Consumir !"
@ -1798,10 +1803,6 @@ msgstr ""
"Marcar esta casilla si usted quiere registrarse en el WEI. Si duda, podrá " "Marcar esta casilla si usted quiere registrarse en el WEI. Si duda, podrá "
"registrarse más tarde, después de validar su cuenta Note Kfet." "registrarse más tarde, después de validar su cuenta Note Kfet."
#: apps/registration/forms.py:63
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."
#: apps/registration/forms.py:96 #: apps/registration/forms.py:96
msgid "Join BDE Club" msgid "Join BDE Club"
msgstr "Afiliarse al club BDE" msgstr "Afiliarse al club BDE"
@ -1950,11 +1951,7 @@ msgstr "Detalles de la afiliación"
msgid "You must join the BDE." msgid "You must join the BDE."
msgstr "Usted tiene que afiliarse al BDE." msgstr "Usted tiene que afiliarse al BDE."
#: apps/registration/views.py:280 #: apps/registration/views.py:284
msgid "You must join BDE club before joining Kfet club."
msgstr "Tiene que afiliarse al club BDE antes de afiliarse al club Kfet."
#: apps/registration/views.py:285
msgid "" msgid ""
"The entered amount is not enough for the memberships, should be at least {}" "The entered amount is not enough for the memberships, should be at least {}"
msgstr "" msgstr ""
@ -2034,7 +2031,7 @@ msgstr "Une factura no puede ser modificada cuando esta bloqueada."
msgid "tex source" msgid "tex source"
msgstr "código fuente TeX" msgstr "código fuente TeX"
#: apps/treasury/models.py:109 apps/treasury/models.py:122 #: apps/treasury/models.py:109 apps/treasury/models.py:125
msgid "invoice" msgid "invoice"
msgstr "factura" msgstr "factura"
@ -2107,7 +2104,7 @@ msgstr "proxys de transacciones especiales"
msgid "credit transaction" msgid "credit transaction"
msgstr "transacción de crédito" msgstr "transacción de crédito"
#: apps/treasury/models.py:360 #: apps/treasury/models.py:361
msgid "" msgid ""
"This user doesn't have enough money to pay the memberships with its note. " "This user doesn't have enough money to pay the memberships with its note. "
"Please ask her/him to credit the note before invalidating this credit." "Please ask her/him to credit the note before invalidating this credit."
@ -2116,16 +2113,16 @@ msgstr ""
"afiliaciones. Por favor pídelo acreditar su note antes de invalidar este " "afiliaciones. Por favor pídelo acreditar su note antes de invalidar este "
"crédito." "crédito."
#: apps/treasury/models.py:375 #: apps/treasury/models.py:376
#: apps/treasury/templates/treasury/sogecredit_detail.html:10 #: apps/treasury/templates/treasury/sogecredit_detail.html:10
msgid "Credit from the Société générale" msgid "Credit from the Société générale"
msgstr "Crédito de la Société Générale" msgstr "Crédito de la Société Générale"
#: apps/treasury/models.py:376 #: apps/treasury/models.py:377
msgid "Credits from the Société générale" msgid "Credits from the Société générale"
msgstr "Créditos de la Société Générale" msgstr "Créditos de la Société Générale"
#: apps/treasury/models.py:379 #: apps/treasury/models.py:380
#, python-brace-format #, python-brace-format
msgid "Soge credit for {user}" msgid "Soge credit for {user}"
msgstr "Crédito de la Société Générale para {user}" msgstr "Crédito de la Société Générale para {user}"
@ -2521,7 +2518,7 @@ msgstr "informaciones sobre la afiliación"
#: apps/wei/models.py:241 #: apps/wei/models.py:241
msgid "" msgid ""
"Information about the registration (buses for old members, survey fot the " "Information about the registration (buses for old members, survey for the "
"new members), encoded in JSON" "new members), encoded in JSON"
msgstr "" msgstr ""
"Informaciones sobre la afiliacion (bus para miembros ancianos, cuestionario " "Informaciones sobre la afiliacion (bus para miembros ancianos, cuestionario "
@ -2902,6 +2899,10 @@ msgid "English"
msgstr "Ingles" msgstr "Ingles"
#: note_kfet/settings/base.py:157 #: note_kfet/settings/base.py:157
msgid "Spanish"
msgstr "Español"
#: note_kfet/settings/base.py:158
msgid "French" msgid "French"
msgstr "Francés" msgstr "Francés"
@ -2916,7 +2917,7 @@ msgid ""
"coke." "coke."
msgstr "" msgstr ""
"Un error ocurrió con lo que pidió. ¡ Pero ni idea de lo que falló ! Un " "Un error ocurrió con lo que pidió. ¡ Pero ni idea de lo que falló ! Un "
"correo electrónico fue enviado a los responsables técnicos de la pagina. " "correo electrónico fue enviado a los responsables técnicos de la página. "
"Mientras usted puede relajarse." "Mientras usted puede relajarse."
#: note_kfet/templates/403.html:10 #: note_kfet/templates/403.html:10
@ -2933,7 +2934,7 @@ msgstr "Detalles del error :"
#: note_kfet/templates/404.html:10 #: note_kfet/templates/404.html:10
msgid "Page not found" msgid "Page not found"
msgstr "Pagina no encontrada" msgstr "Página no encontrada"
#: note_kfet/templates/404.html:14 #: note_kfet/templates/404.html:14
#, python-format #, python-format
@ -2953,7 +2954,7 @@ msgid ""
msgstr "" msgstr ""
"Lo siento, un error ocurrió mientras procesaba lo que pidió. Un correo " "Lo siento, un error ocurrió mientras procesaba lo que pidió. Un correo "
"electrónico con los detalles fue enviado a los responsables técnicos de la " "electrónico con los detalles fue enviado a los responsables técnicos de la "
"pagina. Mientras usted puede relajarse." "página. Mientras usted puede relajarse."
#: note_kfet/templates/autocomplete_model.html:14 #: note_kfet/templates/autocomplete_model.html:14
msgid "Reset" msgid "Reset"
@ -3047,7 +3048,7 @@ msgid ""
"page. Would you like to login to a different account, or with a higher " "page. Would you like to login to a different account, or with a higher "
"permission mask?" "permission mask?"
msgstr "" msgstr ""
"Está conectado como %(username)s, y no se permite que vea este pagina. " "Está conectado como %(username)s, y no se permite que vea este página. "
"Quiere conectarse con otra cuenta, o con más permisos (antifaz de permisos " "Quiere conectarse con otra cuenta, o con más permisos (antifaz de permisos "
"más largo) ?" "más largo) ?"
@ -3139,3 +3140,9 @@ msgstr ""
"cuenta antes que usted pueda conectarse. Usted tiene que ir en la Kfet para " "cuenta antes que usted pueda conectarse. Usted tiene que ir en la Kfet para "
"pagar su afiliación. Tambien tiene que validar su correo electronico con el " "pagar su afiliación. Tambien tiene que validar su correo electronico con el "
"enlace que recibió." "enlace que recibió."
#~ msgid "Check this case is the Société Générale paid the inscription."
#~ msgstr "Marcar esta casilla si Société Générale pagó la registración."
#~ msgid "You must join BDE club before joining Kfet club."
#~ msgstr "Tiene que afiliarse al club BDE antes de afiliarse al club Kfet."

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

@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-04 20:11+0200\n" "POT-Creation-Date: 2020-09-13 12:35+0200\n"
"PO-Revision-Date: 2020-09-13 11:51+0200\n" "PO-Revision-Date: 2020-09-13 12:36+0200\n"
"Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n" "Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: fr\n" "Language: fr\n"
@ -535,7 +535,7 @@ 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:164 apps/registration/forms.py:63 #: apps/member/forms.py:164 apps/registration/forms.py:63
msgid "Check this case is the Société Générale paid the inscription." 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." msgstr "Cochez cette case si la Société Générale a payé l'inscription."
#: apps/member/forms.py:169 apps/registration/forms.py:68 #: apps/member/forms.py:169 apps/registration/forms.py:68
@ -1812,10 +1812,6 @@ msgstr ""
"pourrez toujours vous inscrire plus tard, après avoir validé votre compte à " "pourrez toujours vous inscrire plus tard, après avoir validé votre compte à "
"la Kfet." "la Kfet."
#: apps/registration/forms.py:63
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."
#: apps/registration/forms.py:96 #: apps/registration/forms.py:96
msgid "Join BDE Club" msgid "Join BDE Club"
msgstr "Adhérer au club BDE" msgstr "Adhérer au club BDE"
@ -2115,7 +2111,7 @@ msgstr "proxys de transactions spéciales"
msgid "credit transaction" msgid "credit transaction"
msgstr "transaction de crédit" msgstr "transaction de crédit"
#: apps/treasury/models.py:360 #: apps/treasury/models.py:361
msgid "" msgid ""
"This user doesn't have enough money to pay the memberships with its note. " "This user doesn't have enough money to pay the memberships with its note. "
"Please ask her/him to credit the note before invalidating this credit." "Please ask her/him to credit the note before invalidating this credit."
@ -2123,16 +2119,16 @@ msgstr ""
"Cet utilisateur n'a pas assez d'argent pour payer les adhésions avec sa " "Cet utilisateur n'a pas assez d'argent pour payer les adhésions avec sa "
"note. Merci de lui demander de recharger sa note avant d'invalider ce crédit." "note. Merci de lui demander de recharger sa note avant d'invalider ce crédit."
#: apps/treasury/models.py:375 #: apps/treasury/models.py:376
#: apps/treasury/templates/treasury/sogecredit_detail.html:10 #: apps/treasury/templates/treasury/sogecredit_detail.html:10
msgid "Credit from the Société générale" msgid "Credit from the Société générale"
msgstr "Crédit de la Société générale" msgstr "Crédit de la Société générale"
#: apps/treasury/models.py:376 #: apps/treasury/models.py:377
msgid "Credits from the Société générale" msgid "Credits from the Société générale"
msgstr "Crédits de la Société générale" msgstr "Crédits de la Société générale"
#: apps/treasury/models.py:379 #: apps/treasury/models.py:380
#, python-brace-format #, python-brace-format
msgid "Soge credit for {user}" msgid "Soge credit for {user}"
msgstr "Crédit de la société générale pour l'utilisateur {user}" msgstr "Crédit de la société générale pour l'utilisateur {user}"
@ -2532,7 +2528,7 @@ msgstr "informations sur l'inscription"
#: apps/wei/models.py:241 #: apps/wei/models.py:241
msgid "" msgid ""
"Information about the registration (buses for old members, survey fot the " "Information about the registration (buses for old members, survey for the "
"new members), encoded in JSON" "new members), encoded in JSON"
msgstr "" msgstr ""
"Informations sur l'inscription (bus pour les 2A+, questionnaire pour les " "Informations sur l'inscription (bus pour les 2A+, questionnaire pour les "
@ -2917,6 +2913,10 @@ msgid "English"
msgstr "Anglais" msgstr "Anglais"
#: note_kfet/settings/base.py:157 #: note_kfet/settings/base.py:157
msgid "Spanish"
msgstr "Espagnol"
#: note_kfet/settings/base.py:158
msgid "French" msgid "French"
msgstr "Français" msgstr "Français"
@ -3162,3 +3162,6 @@ msgstr ""
"vous connecter. Vous devez vous rendre à la Kfet et payer les frais " "vous connecter. Vous devez vous rendre à la Kfet et payer les frais "
"d'adhésion. Vous devez également valider votre adresse email en suivant le " "d'adhésion. Vous devez également valider votre adresse email en suivant le "
"lien que vous avez reçu." "lien que vous avez reçu."
#~ 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."