From a752dcd95ca050ffb1253c226d0a343eea36716c Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sun, 20 Feb 2022 15:07:07 +0100
Subject: [PATCH] Update help texts
---
aleksis/apps/paweljong/forms.py | 67 +++++++++++++++++----------------
1 file changed, 34 insertions(+), 33 deletions(-)
diff --git a/aleksis/apps/paweljong/forms.py b/aleksis/apps/paweljong/forms.py
index c36b35f..44c1fd6 100644
--- a/aleksis/apps/paweljong/forms.py
+++ b/aleksis/apps/paweljong/forms.py
@@ -174,9 +174,9 @@ class EditVoucherForm(forms.ModelForm):
),
}
help_texts = {
- "event": _("Event the voucher is valid for."),
- "person": _("Person the voucher is valid for."),
- "discount": _("Voucher discount."),
+ "event": _("Event the voucher is valid for"),
+ "person": _("Person the voucher is valid for"),
+ "discount": _("Voucher discount"),
}
@@ -186,18 +186,18 @@ class GenerateListForm(forms.Form):
group = forms.ModelChoiceField(
label=_("Group"),
queryset=Group.objects.all(),
- help_text=_("Select group to generate list."),
+ help_text=_("Select group to generate list"),
)
template = forms.ChoiceField(
label=_("Template"),
choices=TEMPLATE_CHOICES,
- help_text=_("Select template to generate list."),
+ help_text=_("Select template to generate list"),
)
landscape = forms.BooleanField(
label=_("Landscape"),
- help_text=_("Select if output should be in landscape."),
+ help_text=_("Select if output should be in landscape"),
required=False,
)
@@ -219,7 +219,7 @@ class RegisterEventGuardians(ExtensibleForm):
)
guardian_first_name = forms.CharField(
- label=_("Guardians first name"),
+ label=_("Guardian's first name"),
help_text=_(
"Please enter the first name of the legal guardian who will fill in the registration "
"with you and who can be reached during the event in an emergency."
@@ -227,7 +227,7 @@ class RegisterEventGuardians(ExtensibleForm):
)
guardian_last_name = forms.CharField(
- label=_("Guardians last name"),
+ label=_("Guardian's last name"),
help_text=_(
"Please enter the last name of the legal guardian who will fill in the registration "
"with you and who can be reached during the event in an emergency."
@@ -235,7 +235,7 @@ class RegisterEventGuardians(ExtensibleForm):
)
guardian_mobile_number = PhoneNumberField(
- label=_("Guardians mobile number"),
+ label=_("Guardian's mobile number"),
help_text=_(
"We need the mobile phone number for emergencies if we "
"urgently need to reach your parents during the event."
@@ -243,7 +243,7 @@ class RegisterEventGuardians(ExtensibleForm):
)
guardian_email = forms.EmailField(
- label=_("Guardians email address"),
+ label=_("Guardian's email address"),
)
@@ -317,9 +317,7 @@ class RegisterEventContactDetails(ExtensibleForm):
label=_("Sex"),
help_text=_(
"For various reasons, e.g. because we have to keep gender segregation during the night "
- "for legal reasons, we need to know if you are a boy or a girl. "
- " With some names this is not always immediately recognizable, so we ask you to "
- "indicate it here."
+ "for legal reasons, we need to know if you are a boy or a girl."
),
choices=Person.SEX_CHOICES,
initial=None,
@@ -327,21 +325,24 @@ class RegisterEventContactDetails(ExtensibleForm):
email = forms.EmailField(
label=_("Email address"),
+ help_text=_("Please use your perosnal e-mail address here, which you will check "
+ "personally. Important information will always be sent to your parents "
+ "as well. Do not use an e-mail address owned by your parents here."),
)
school = forms.CharField(
label=_("School"),
- help_text=_("Please enter the name of your school as exactly as it should be written."),
+ help_text=_("Please enter the name of your school."),
)
school_place = forms.CharField(
label=_("School place"),
- help_text=_("Enter the place (city) where your school is located (without a district)."),
+ help_text=_("Enter the place (city) where your school is located."),
)
school_class = forms.CharField(
label=_("School class"),
- help_text=_("Please enter the class you are going to (e.g. 8a)."),
+ help_text=_("Please enter the class you are in (e.g. 8a)."),
)
@@ -361,6 +362,12 @@ class RegisterEventAdditional(ExtensibleForm):
class Meta:
model = EventRegistration
fields = ["medical_information", "comment"]
+ help_texts = {
+ "medical_informaiton": _("If there are any medically important things we need to "
+ "consider, e.g. when making food or to make sure you take "
+ "prescribed medication, please enter it here."),
+ "comment": _("You can write down any remarks you want to tell us here."),
+ }
def __init__(self, event, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -396,26 +403,20 @@ class RegisterEventFinancial(ExtensibleForm):
model = EventRegistration
fields = ["voucher_code", "iban", "donation", "accept_sepa"]
help_texts = {
- "voucher": _(
- "If you have a voucher for the event, enter the code here. "
- "It will be charged automatically."
- ),
- "donation": (
+ "donation": _(
"Our association would like to offer all children and young "
- "people the opportunity to participate in our events. Often, "
- "however, the family fee cannot be paid. We therefore have a "
+ "people the opportunity to participate in our events. Sometimes, "
+ "however, families cannot afford the full fee. We therefore have a "
"budget from which we can promote participation after we have "
"carefully examined the necessity and eligibility. We rely on "
"donations for this budget. If you would like to donate a voluntary "
- "additional amount for this budget, please indicate this here. We do "
- "not permanently save whether and if so in what amount donations are "
- "made and also not within the association, e.g. passed on to leisure supervisors."
+ "additional amount for this budget, please indicate this here."
),
"accept_sepa": _(
- "Parents: I authorize the creditor e.V., Rochusstr. 2-4, 53123 Bonn with "
- "creditor ID DE70FZT00001497650, to collect the participant fee from my account "
+ "Parents: I authorize the creditor Teckids e.V., Kennedyallee 18, 53175 Bonn with "
+ "creditor ID DE70ZZZ00001497650, to collect the participant fee from my account "
"once using the SEPA core direct debit. At the same time, I instruct my bank to "
- "redeem the SEPA core direct debit withdrawn from my account by e.V."
+ "redeem the SEPA core direct debit withdrawn from my account by Teckids e.V."
),
"iban": _(
"If your parents want to pay by SEPA direct debit, "
@@ -438,10 +439,10 @@ class RegisterEventConsent(ExtensibleForm):
fields = ["accept_terms", "accept_data", "accept_general_terms"]
help_texts = {
"accept_terms": _(
- "Parents: My child filled out the registration form together with me, but myself, "
- "and I agree to the participation, the terms of use and the terms and conditions. "
+ "Parents: My child filled out the registration form themselves, and in my presence. "
+ "I agree with the participation, the terms of use and the terms and conditions. "
"I am aware that the registration is binding and that withdrawal is only possible "
- "in exceptional cases with a valid reason. In addition, I agree to pay the "
+ "in exceptional cases with an important reason. In addition, I agree to pay the "
"participation fee in advance and agree to the reimbursement guidelines "
"mentioned above."
),
@@ -451,7 +452,7 @@ class RegisterEventConsent(ExtensibleForm):
"age of 16, my parents also agree to this and I can prove this on request "
"(e.g. by making contact with my parents)."
),
- "accept_general_terms": _("I agree with the AGB and have read them."),
+ "accept_general_terms": _("I agree with the terms and conditions and have read them."),
}
--
GitLab