From 1e4cbf60c5106a1e0e04401c47e4bc347fcb6084 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 13 Aug 2020 19:29:01 +0200
Subject: [PATCH] Display the full price of the WEI, including the BDE and the
Kfet membership
---
apps/wei/templates/wei/weiclub_info.html | 10 ++++---
locale/de/LC_MESSAGES/django.po | 31 ++++++++++++---------
locale/fr/LC_MESSAGES/django.po | 35 ++++++++++++++----------
3 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/apps/wei/templates/wei/weiclub_info.html b/apps/wei/templates/wei/weiclub_info.html
index 99c57e28..ef9af818 100644
--- a/apps/wei/templates/wei/weiclub_info.html
+++ b/apps/wei/templates/wei/weiclub_info.html
@@ -28,13 +28,15 @@
<dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
{% else %}
{% 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>
- <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }} / {{ club.membership_fee_paid|add:bde_kfet_fee|pretty_money }}</dd>
+ <dt class="col-xl-6">{% trans 'WEI fee (paid students)'|capfirst %}</dt>
+ <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 %}
{% 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>
- <dd class="col-xl-6">{{ club.membership_fee_unpaid|pretty_money }} / {{ club.membership_fee_unpaid|add:bde_kfet_fee|pretty_money }}</dd>
+ <dt class="col-xl-6">{% trans 'WEI fee (unpaid students)'|capfirst %}</dt>
+ <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 %}
{% endif %}
{% endif %}
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index fc02e6f6..55b6a9ec 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\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"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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/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
msgid "email"
msgstr ""
@@ -758,13 +758,13 @@ msgstr ""
#: apps/member/templates/member/club_info.html:50
#: apps/member/templates/member/profile_info.html:36
#: 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"
msgstr ""
#: apps/member/templates/member/club_info.html:54
#: 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"
msgstr ""
@@ -777,7 +777,7 @@ msgstr ""
#: 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:33
-#: apps/wei/templates/wei/weiclub_info.html:68
+#: apps/wei/templates/wei/weiclub_info.html:70
msgid "Edit"
msgstr ""
@@ -2338,30 +2338,35 @@ msgid "The survey is now ended. Your answers have been saved."
msgstr ""
#: apps/wei/templates/wei/weiclub_info.html:31
-msgid "WEI fee / including BDE and Kfet fee (paid students)"
+msgid "WEI fee (paid students)"
msgstr ""
-#: apps/wei/templates/wei/weiclub_info.html:36
-msgid "WEI fee / including BDE and Kfet fee (unpaid students)"
+#: apps/wei/templates/wei/weiclub_info.html:33
+#: apps/wei/templates/wei/weiclub_info.html:39
+msgid "The BDE membership is included in the WEI registration."
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"
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"
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+"
msgstr ""
-#: apps/wei/templates/wei/weiclub_info.html:71
+#: apps/wei/templates/wei/weiclub_info.html:73
msgid "Add bus"
msgstr ""
-#: apps/wei/templates/wei/weiclub_info.html:75
+#: apps/wei/templates/wei/weiclub_info.html:77
msgid "View WEI"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index cdc76b39..166711ee 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\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"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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/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
msgid "email"
msgstr "courriel"
@@ -769,13 +769,13 @@ msgstr "cotisation pour adhérer"
#: apps/member/templates/member/club_info.html:50
#: apps/member/templates/member/profile_info.html:36
#: 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"
msgstr "solde du compte"
#: apps/member/templates/member/club_info.html:54
#: 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"
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/templates/wei/busteam_tables.html:15
#: 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"
msgstr "Éditer"
@@ -2423,30 +2423,35 @@ msgstr ""
"Le sondage est désormais terminé, vos réponses ont bien été enregistrées."
#: apps/wei/templates/wei/weiclub_info.html:31
-msgid "WEI fee / including BDE and Kfet fee (paid students)"
-msgstr "Prix du WEI / incluant l'adhésion BDE/Kfet (élèves)"
+msgid "WEI fee (paid students)"
+msgstr "Prix du WEI (élèves)"
-#: apps/wei/templates/wei/weiclub_info.html:36
-msgid "WEI fee / including BDE and Kfet fee (unpaid students)"
-msgstr "Prix du WEI / incluant l'adhésion BDE/Kfet (étudiants)"
+#: apps/wei/templates/wei/weiclub_info.html:33
+#: apps/wei/templates/wei/weiclub_info.html:39
+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"
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"
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+"
msgstr "Inscrire un 2A+"
-#: apps/wei/templates/wei/weiclub_info.html:71
+#: apps/wei/templates/wei/weiclub_info.html:73
msgid "Add bus"
msgstr "Ajouter un bus"
-#: apps/wei/templates/wei/weiclub_info.html:75
+#: apps/wei/templates/wei/weiclub_info.html:77
msgid "View WEI"
msgstr "Voir le WEI"
--
GitLab