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

Display the full price of the WEI, including the BDE and the Kfet membership

This commit is contained in:
Yohann D'ANELLO 2020-08-13 19:29:01 +02:00
parent dfe4bf2175
commit 1e4cbf60c5
3 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/wei/templates/wei/weiclub_info.html
View File

@ -28,13 +28,15 @@
<dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd> <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
{% else %} {% else %}
{% with bde_kfet_fee=club.parent_club.membership_fee_paid|add:club.parent_club.parent_club.membership_fee_paid %} {% with bde_kfet_fee=club.parent_club.membership_fee_paid|add:club.parent_club.parent_club.membership_fee_paid %}
<dt class="col-xl-6">{% trans 'WEI fee / including BDE and Kfet fee (paid students)'|capfirst %}</dt> <dt class="col-xl-6">{% trans 'WEI fee (paid students)'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }} / {{ club.membership_fee_paid|add:bde_kfet_fee|pretty_money }}</dd> <dd class="col-xl-6">{{ club.membership_fee_paid|add:bde_kfet_fee|pretty_money }}
<i class="fas fa-question-circle" title="{% trans "The BDE membership is included in the WEI registration." %}"></i></dd>
{% endwith %} {% endwith %}
{% with bde_kfet_fee=club.parent_club.membership_fee_unpaid|add:club.parent_club.parent_club.membership_fee_unpaid %} {% with bde_kfet_fee=club.parent_club.membership_fee_unpaid|add:club.parent_club.parent_club.membership_fee_unpaid %}
<dt class="col-xl-6">{% trans 'WEI fee / including BDE and Kfet fee (unpaid students)'|capfirst %}</dt> <dt class="col-xl-6">{% trans 'WEI fee (unpaid students)'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_fee_unpaid|pretty_money }} / {{ club.membership_fee_unpaid|add:bde_kfet_fee|pretty_money }}</dd> <dd class="col-xl-6">{{ club.membership_fee_unpaid|add:bde_kfet_fee|pretty_money }}
<i class="fas fa-question-circle" title="{% trans "The BDE membership is included in the WEI registration." %}"></i></dd>
{% endwith %} {% endwith %}
{% endif %} {% endif %}
{% endif %} {% endif %}

31
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-13 18:02+0200\n" "POT-Creation-Date: 2020-08-13 19:22+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"
@ -631,7 +631,7 @@ msgstr ""
#: apps/member/models.py:180 apps/member/templates/member/club_info.html:57 #: apps/member/models.py:180 apps/member/templates/member/club_info.html:57
#: apps/registration/templates/registration/future_profile_detail.html:22 #: apps/registration/templates/registration/future_profile_detail.html:22
#: apps/wei/templates/wei/weiclub_info.html:52 #: apps/wei/templates/wei/weiclub_info.html:54
#: apps/wei/templates/wei/weimembership_form.html:24 #: apps/wei/templates/wei/weimembership_form.html:24
msgid "email" msgid "email"
msgstr "" msgstr ""
@ -758,13 +758,13 @@ msgstr ""
#: apps/member/templates/member/club_info.html:50 #: apps/member/templates/member/club_info.html:50
#: apps/member/templates/member/profile_info.html:36 #: apps/member/templates/member/profile_info.html:36
#: apps/treasury/templates/treasury/sogecredit_detail.html:18 #: apps/treasury/templates/treasury/sogecredit_detail.html:18
#: apps/wei/templates/wei/weiclub_info.html:43 #: apps/wei/templates/wei/weiclub_info.html:45
msgid "balance" msgid "balance"
msgstr "" msgstr ""
#: apps/member/templates/member/club_info.html:54 #: apps/member/templates/member/club_info.html:54
#: apps/member/templates/member/profile_info.html:40 #: apps/member/templates/member/profile_info.html:40
#: apps/note/models/notes.py:235 apps/wei/templates/wei/weiclub_info.html:48 #: apps/note/models/notes.py:235 apps/wei/templates/wei/weiclub_info.html:50
msgid "aliases" msgid "aliases"
msgstr "" msgstr ""
@ -777,7 +777,7 @@ msgstr ""
#: apps/wei/tables.py:47 apps/wei/templates/wei/bus_tables.html:15 #: apps/wei/tables.py:47 apps/wei/templates/wei/bus_tables.html:15
#: apps/wei/templates/wei/busteam_tables.html:15 #: apps/wei/templates/wei/busteam_tables.html:15
#: apps/wei/templates/wei/busteam_tables.html:33 #: apps/wei/templates/wei/busteam_tables.html:33
#: apps/wei/templates/wei/weiclub_info.html:68 #: apps/wei/templates/wei/weiclub_info.html:70
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
@ -2338,30 +2338,35 @@ msgid "The survey is now ended. Your answers have been saved."
msgstr "" msgstr ""
#: apps/wei/templates/wei/weiclub_info.html:31 #: apps/wei/templates/wei/weiclub_info.html:31
msgid "WEI fee / including BDE and Kfet fee (paid students)" msgid "WEI fee (paid students)"
msgstr "" msgstr ""
#: apps/wei/templates/wei/weiclub_info.html:36 #: apps/wei/templates/wei/weiclub_info.html:33
msgid "WEI fee / including BDE and Kfet fee (unpaid students)" #: apps/wei/templates/wei/weiclub_info.html:39
msgid "The BDE membership is included in the WEI registration."
msgstr "" msgstr ""
#: apps/wei/templates/wei/weiclub_info.html:58 #: apps/wei/templates/wei/weiclub_info.html:37
msgid "WEI fee (unpaid students)"
msgstr ""
#: apps/wei/templates/wei/weiclub_info.html:60
msgid "WEI list" msgid "WEI list"
msgstr "" msgstr ""
#: apps/wei/templates/wei/weiclub_info.html:62 apps/wei/views.py:507 #: apps/wei/templates/wei/weiclub_info.html:64 apps/wei/views.py:507
msgid "Register 1A" msgid "Register 1A"
msgstr "" msgstr ""
#: apps/wei/templates/wei/weiclub_info.html:65 apps/wei/views.py:574 #: apps/wei/templates/wei/weiclub_info.html:67 apps/wei/views.py:574
msgid "Register 2A+" msgid "Register 2A+"
msgstr "" msgstr ""
#: apps/wei/templates/wei/weiclub_info.html:71 #: apps/wei/templates/wei/weiclub_info.html:73
msgid "Add bus" msgid "Add bus"
msgstr "" msgstr ""
#: apps/wei/templates/wei/weiclub_info.html:75 #: apps/wei/templates/wei/weiclub_info.html:77
msgid "View WEI" msgid "View WEI"
msgstr "" msgstr ""

35
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-13 18:02+0200\n" "POT-Creation-Date: 2020-08-13 19:22+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"
@ -634,7 +634,7 @@ msgstr "Activez votre compte Note Kfet"
#: apps/member/models.py:180 apps/member/templates/member/club_info.html:57 #: apps/member/models.py:180 apps/member/templates/member/club_info.html:57
#: apps/registration/templates/registration/future_profile_detail.html:22 #: apps/registration/templates/registration/future_profile_detail.html:22
#: apps/wei/templates/wei/weiclub_info.html:52 #: apps/wei/templates/wei/weiclub_info.html:54
#: apps/wei/templates/wei/weimembership_form.html:24 #: apps/wei/templates/wei/weimembership_form.html:24
msgid "email" msgid "email"
msgstr "courriel" msgstr "courriel"
@ -769,13 +769,13 @@ msgstr "cotisation pour adhérer"
#: apps/member/templates/member/club_info.html:50 #: apps/member/templates/member/club_info.html:50
#: apps/member/templates/member/profile_info.html:36 #: apps/member/templates/member/profile_info.html:36
#: apps/treasury/templates/treasury/sogecredit_detail.html:18 #: apps/treasury/templates/treasury/sogecredit_detail.html:18
#: apps/wei/templates/wei/weiclub_info.html:43 #: apps/wei/templates/wei/weiclub_info.html:45
msgid "balance" msgid "balance"
msgstr "solde du compte" msgstr "solde du compte"
#: apps/member/templates/member/club_info.html:54 #: apps/member/templates/member/club_info.html:54
#: apps/member/templates/member/profile_info.html:40 #: apps/member/templates/member/profile_info.html:40
#: apps/note/models/notes.py:235 apps/wei/templates/wei/weiclub_info.html:48 #: apps/note/models/notes.py:235 apps/wei/templates/wei/weiclub_info.html:50
msgid "aliases" msgid "aliases"
msgstr "alias" msgstr "alias"
@ -788,7 +788,7 @@ msgstr "Ajouter un membre"
#: apps/wei/tables.py:47 apps/wei/templates/wei/bus_tables.html:15 #: apps/wei/tables.py:47 apps/wei/templates/wei/bus_tables.html:15
#: apps/wei/templates/wei/busteam_tables.html:15 #: apps/wei/templates/wei/busteam_tables.html:15
#: apps/wei/templates/wei/busteam_tables.html:33 #: apps/wei/templates/wei/busteam_tables.html:33
#: apps/wei/templates/wei/weiclub_info.html:68 #: apps/wei/templates/wei/weiclub_info.html:70
msgid "Edit" msgid "Edit"
msgstr "Éditer" msgstr "Éditer"
@ -2423,30 +2423,35 @@ msgstr ""
"Le sondage est désormais terminé, vos réponses ont bien été enregistrées." "Le sondage est désormais terminé, vos réponses ont bien été enregistrées."
#: apps/wei/templates/wei/weiclub_info.html:31 #: apps/wei/templates/wei/weiclub_info.html:31
msgid "WEI fee / including BDE and Kfet fee (paid students)" msgid "WEI fee (paid students)"
msgstr "Prix du WEI / incluant l'adhésion BDE/Kfet (élèves)" msgstr "Prix du WEI (élèves)"
#: apps/wei/templates/wei/weiclub_info.html:36 #: apps/wei/templates/wei/weiclub_info.html:33
msgid "WEI fee / including BDE and Kfet fee (unpaid students)" #: apps/wei/templates/wei/weiclub_info.html:39
msgstr "Prix du WEI / incluant l'adhésion BDE/Kfet (étudiants)" msgid "The BDE membership is included in the WEI registration."
msgstr "L'adhésion au BDE est offerte avec l'inscription au WEI."
#: apps/wei/templates/wei/weiclub_info.html:58 #: apps/wei/templates/wei/weiclub_info.html:37
msgid "WEI fee (unpaid students)"
msgstr "Prix du WEI (étudiants)"
#: apps/wei/templates/wei/weiclub_info.html:60
msgid "WEI list" msgid "WEI list"
msgstr "Liste des WEI" msgstr "Liste des WEI"
#: apps/wei/templates/wei/weiclub_info.html:62 apps/wei/views.py:507 #: apps/wei/templates/wei/weiclub_info.html:64 apps/wei/views.py:507
msgid "Register 1A" msgid "Register 1A"
msgstr "Inscrire un 1A" msgstr "Inscrire un 1A"
#: apps/wei/templates/wei/weiclub_info.html:65 apps/wei/views.py:574 #: apps/wei/templates/wei/weiclub_info.html:67 apps/wei/views.py:574
msgid "Register 2A+" msgid "Register 2A+"
msgstr "Inscrire un 2A+" msgstr "Inscrire un 2A+"
#: apps/wei/templates/wei/weiclub_info.html:71 #: apps/wei/templates/wei/weiclub_info.html:73
msgid "Add bus" msgid "Add bus"
msgstr "Ajouter un bus" msgstr "Ajouter un bus"
#: apps/wei/templates/wei/weiclub_info.html:75 #: apps/wei/templates/wei/weiclub_info.html:77
msgid "View WEI" msgid "View WEI"
msgstr "Voir le WEI" msgstr "Voir le WEI"