From 59e8237a3f8951fa4a7bebd5c77bfc18b0348687 Mon Sep 17 00:00:00 2001
From: mariusrklein <47218379+mariusrklein@users.noreply.github.com>
Date: Sun, 6 Apr 2025 15:36:01 +0200
Subject: [PATCH] fix: improved verbosity of org fee calculation
---
jdav_web/members/locale/de/LC_MESSAGES/django.po | 12 ++++++++----
.../templates/admin/freizeit_finance_overview.html | 4 +++-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index ed43669..381d19f 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/de/LC_MESSAGES/django.po
@@ -1380,17 +1380,21 @@ msgstr ""
"Keine Empfänger*innen für Sektionszuschüsse angegeben. Es werden daher keine "
"Sektionszuschüsse ausbezahlt."
+#: members/templates/admin/freizeit_finance_overview.html
+msgid "Org fee"
+msgstr "Organisationsbeitrag"
+
#: members/templates/admin/freizeit_finance_overview.html
#, python-format
msgid ""
"Warning: %(old_participant_count)s participant(s) of the excursion are 27 or "
"older. For each of them, an organisation fee of 10,00 € per day has to be "
-"paid to the account. A total of %(total_org_fee_theoretical)s € is charged "
-"against the other transactions."
+"paid to the account. With a duration of %(duration)s days, a total of "
+"%(total_org_fee_theoretical)s € is charged against the other transactions."
msgstr ""
"Achtung: %(old_participant_count)s Teilnehmende der Ausfahrt sind 27 oder "
-"älter. Für diese Teilnehmende ist ein Org-Beitrag von 10,00 € pro Tag "
-"fällig. Daher werden insgesamt %(total_org_fee_theoretical)s € mit den "
+"älter. Für diese Teilnehmende(n) ist ein Org-Beitrag von 10,00 € pro Tag "
+"fällig. Durch die Länge der Ausfahrt von %(duration)s Tagen werden insgesamt %(total_org_fee_theoretical)s € mit den "
"Zuschüssen und Aufwandsentschädigungen verrechnet, sofern diese in Anspruch "
"genommen werden."
diff --git a/jdav_web/members/templates/admin/freizeit_finance_overview.html b/jdav_web/members/templates/admin/freizeit_finance_overview.html
index 00a759f..bd50ae5 100644
--- a/jdav_web/members/templates/admin/freizeit_finance_overview.html
+++ b/jdav_web/members/templates/admin/freizeit_finance_overview.html
@@ -125,8 +125,10 @@ cost plan!
{% endif %}
{% if total_org_fee %}
+
+{% trans "Org fee" %}
-{% blocktrans %}Warning: {{ old_participant_count }} participant(s) of the excursion are 27 or older. For each of them, an organisation fee of 10,00 € per day has to be paid to the account. A total of {{ total_org_fee_theoretical }} € is charged against the other transactions.{% endblocktrans %}
+{% blocktrans %}Warning: {{ old_participant_count }} participant(s) of the excursion are 27 or older. For each of them, an organisation fee of 10,00 € per day has to be paid to the account. With a duration of {{ duration }} days, a total of {{ total_org_fee_theoretical }} € is charged against the other transactions.{% endblocktrans %}
{% endif %}