From 84ed08a20ba265c0467dd64b156e269a7abd6dea Mon Sep 17 00:00:00 2001 From: Christian Merten Date: Sun, 6 Apr 2025 19:09:25 +0200 Subject: [PATCH] various whitespace fixes --- jdav_web/finance/models.py | 10 ++++---- .../members/locale/de/LC_MESSAGES/django.po | 25 +++++++++---------- .../admin/freizeit_finance_overview.html | 10 ++++---- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/jdav_web/finance/models.py b/jdav_web/finance/models.py index 4b8c6ba..ba55e97 100644 --- a/jdav_web/finance/models.py +++ b/jdav_web/finance/models.py @@ -71,11 +71,11 @@ class Statement(CommonModel): help_text=_('The person that should receive the subsidy for night and travel costs. Typically the person who paid for them.')) ljp_to = models.ForeignKey(Member, verbose_name=_('Pay ljp contributions to'), - null=True, - blank=True, - on_delete=models.SET_NULL, - related_name='receives_ljp_for_statements', - help_text=_('The person that should receive the ljp contributions for the participants. Should be only selected if an ljp request was submitted.')) + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name='receives_ljp_for_statements', + help_text=_('The person that should receive the ljp contributions for the participants. Should be only selected if an ljp request was submitted.')) night_cost = models.DecimalField(verbose_name=_('Price per night'), default=0, decimal_places=2, max_digits=5) diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po index cc52f01..2e9381a 100644 --- a/jdav_web/members/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/members/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: 2025-04-06 17:30+0200\n" +"POT-Creation-Date: 2025-04-06 18:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -422,8 +422,9 @@ msgid "" "The excursion is configured to claim LJP contributions. In that case, for " "all bills, a proof must be uploaded. Please correct this and try again." msgstr "" -"Für die Ausfahrt werden LJP-Zuschüsse beantragt. Dafür müssen für alle Ausgaben Belege hochgeladen werden. " -"Bitte lade für alle Ausgaben einen Beleg hoch und versuche es erneut. " +"Für die Ausfahrt werden LJP-Zuschüsse beantragt. Dafür müssen für alle " +"Ausgaben Belege hochgeladen werden. Bitte lade für alle Ausgaben einen Beleg " +"hoch und versuche es erneut. " #: members/admin.py msgid "" @@ -1365,21 +1366,19 @@ msgstr "LJP Zuschüsse" #: members/templates/admin/freizeit_finance_overview.html #, python-format msgid "" -"By submitting the given seminar report, you will receive LJP contributions. " -"You have\n" -" documented interventions worth of %(total_seminar_days)s seminar days " -"for %(participant_count)s participants.\n" -" This results in a total contribution of %(ljp_contributions)s€. To " -"receive them, you need to \n" -" submit the LJP-Proposal within 3 weeks after your excursion and have it " -"approved by the finance office. " +"By submitting the given seminar report, you will receive LJP contributions.\n" +"You have documented interventions worth of %(total_seminar_days)s seminar " +"days for %(participant_count)s participants.\n" +"This results in a total contribution of %(ljp_contributions)s€.\n" +"To receive them, you need to submit the LJP-Proposal within 3 weeks after " +"your excursion and have it approved by the finance office." msgstr "" "Wenn du den erstellten LJP-Antrag einreichst, erhältst du LJP-Zuschüsse. Du " "hast Lehreinheiten für insgesamt %(total_seminar_days)s Seminartage und für " "%(participant_count)s Teilnehmende dokumentiert.\n" -" Daraus ergibt sich ein auszahlbarer LJP-Zuschuss von " +"Daraus ergibt sich ein auszahlbarer LJP-Zuschuss von " "%(ljp_contributions)s€. Um den zu erhalten, musst du den LJP-Antrag " -"innerhalb von 3 Wochen nach de Ausfahrt beim Jugendreferat einreichen und " +"innerhalb von 3 Wochen nach der Ausfahrt beim Jugendreferat einreichen und " "formal genehmigt bekommen." #: members/templates/admin/freizeit_finance_overview.html diff --git a/jdav_web/members/templates/admin/freizeit_finance_overview.html b/jdav_web/members/templates/admin/freizeit_finance_overview.html index d3dca14..aecc588 100644 --- a/jdav_web/members/templates/admin/freizeit_finance_overview.html +++ b/jdav_web/members/templates/admin/freizeit_finance_overview.html @@ -135,11 +135,11 @@ cost plan!

{% trans "LJP contributions" %}

- {% blocktrans %}By submitting the given seminar report, you will receive LJP contributions. You have - documented interventions worth of {{ total_seminar_days }} seminar days for {{ participant_count }} participants. - This results in a total contribution of {{ ljp_contributions }}€. To receive them, you need to - submit the LJP-Proposal within 3 weeks after your excursion and have it approved by the finance office. {% endblocktrans %} -

+{% blocktrans %}By submitting the given seminar report, you will receive LJP contributions. +You have documented interventions worth of {{ total_seminar_days }} seminar days for {{ participant_count }} participants. +This results in a total contribution of {{ ljp_contributions }}€. +To receive them, you need to submit the LJP-Proposal within 3 weeks after your excursion and have it approved by the finance office.{% endblocktrans %} +

{% blocktrans %}The LJP contributions are configured to be paid to:{% endblocktrans %}