Fix typo

aleksis/apps/paweljong/filters.py

@@ -11,14 +11,14 @@ from .models import Event, EventRegistration, Terms, Voucher
 class EventRegistrationFilter(FilterSet):
     class Meta:
         model = EventRegistration
-        fields = ["person", "event", "accept_sepa", "date_registred"]
+        fields = ["person", "event", "accept_sepa", "date_registered"]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         self.form.layout = Layout(
             Row("person", "event"),
-            Row("accept_sepa", "date_registred"),
+            Row("accept_sepa", "date_registered"),
         )
 
 

aleksis/apps/paweljong/locale/de_DE/LC_MESSAGES/django.po

@@ -186,38 +186,38 @@ msgid "Last name"
 msgstr "Nachname"
 
 #: aleksis/apps/paweljong/forms.py:209
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:18
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:71
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:18
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:71
 msgid "Street"
 msgstr "Straße"
 
 #: aleksis/apps/paweljong/forms.py:213
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:19
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:72
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:19
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:72
 msgid "Housenumber"
 msgstr "Hausnummer"
 
 #: aleksis/apps/paweljong/forms.py:217
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:20
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:73
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:20
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:73
 msgid "Postal code"
 msgstr "Postleitzahl"
 
 #: aleksis/apps/paweljong/forms.py:221
 #: aleksis/apps/paweljong/templates/templated_email/event_created.email:11
 #: aleksis/apps/paweljong/templates/templated_email/event_created.email:39
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:21
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:74
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:21
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:74
 msgid "Place"
 msgstr "Stadt"
 
 #: aleksis/apps/paweljong/forms.py:225
 #: aleksis/apps/paweljong/templates/paweljong/print/corona.html:22
 #: aleksis/apps/paweljong/templates/paweljong/print/list_participants.html:23
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:17
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:27
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:70
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:80
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:17
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:27
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:70
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:80
 msgid "Mobile number"
 msgstr "Handynummer"
 
@@ -227,8 +227,8 @@ msgstr "deine Handynummer hilft uns, dich bei Notfällen während der Veranstalt
 
 #: aleksis/apps/paweljong/forms.py:235 aleksis/apps/paweljong/forms.py:472
 #: aleksis/apps/paweljong/templates/paweljong/print/list_participants.html:22
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:15
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:68
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:15
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:68
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
@@ -241,10 +241,10 @@ msgid "For various reasons, e.g. because we have to keep gender segregation duri
 msgstr "Aus verschiedenen Gründen, z.B da wir aus rechtlichen Gründen die Geschlechtertrennung während der Nacht aufrechterhalten müssen, müssen wir wissen, ob du ein Junge oder ein Mädchen bist."
 
 #: aleksis/apps/paweljong/forms.py:249
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:16
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:26
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:69
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:79
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:16
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:26
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:69
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:79
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
@@ -439,17 +439,17 @@ msgstr "Informationen über die Veranstaltung"
 #: aleksis/apps/paweljong/models.py:92 aleksis/apps/paweljong/models.py:125
 #: aleksis/apps/paweljong/tables.py:11 aleksis/apps/paweljong/tables.py:28
 #: aleksis/apps/paweljong/templates/paweljong/event/full.html:4
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:8
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:10
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:61
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:63
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:8
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:10
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:61
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:63
 msgid "Event"
 msgstr "Veranstaltung"
 
 #: aleksis/apps/paweljong/models.py:99 aleksis/apps/paweljong/models.py:126
 #: aleksis/apps/paweljong/tables.py:31
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:12
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:65
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:12
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:65
 msgid "Person"
 msgstr "Person"
 
@@ -478,8 +478,8 @@ msgid "Voucher"
 msgstr "Gutschein"
 
 #: aleksis/apps/paweljong/models.py:144
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:31
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:84
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:31
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:84
 msgid "Donation"
 msgstr "Spende"
 
@@ -808,8 +808,8 @@ msgid "Next"
 msgstr "Weiter"
 
 #: aleksis/apps/paweljong/templates/paweljong/event/register_wizard_consent.html:34
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:45
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:100
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:45
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:100
 msgid "Consents"
 msgstr "Einverständnisse"
 
@@ -823,14 +823,14 @@ msgid "Registration information"
 msgstr "Anmeldungsinformationen"
 
 #: aleksis/apps/paweljong/templates/paweljong/event_registration/full.html:133
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:34
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:87
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:34
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:87
 msgid "IBAN"
 msgstr "IBAN"
 
 #: aleksis/apps/paweljong/templates/paweljong/event_registration/full.html:155
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:49
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:104
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:49
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:104
 msgid "Accepted"
 msgstr "Akzeptiert"
 
@@ -993,48 +993,48 @@ msgstr ""
 
 #: aleksis/apps/paweljong/templates/templated_email/event_created.email:26
 #: aleksis/apps/paweljong/templates/templated_email/event_created.email:61
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:53
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:111
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:53
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:111
 msgid "Your AlekSIS team"
 msgstr "Dein AlekSIS-Team"
 
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:3
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:3
 msgid "New registration"
 msgstr "Neue Anmeldung"
 
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:6
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:6
 #, python-format
 msgid "New registration: %(event)s"
 msgstr "Neue Anmeldung: %(event)s"
 
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:14
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:25
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:67
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:78
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:14
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:25
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:67
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:78
 msgid "Name"
 msgstr "Name"
 
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:23
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:76
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:23
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:76
 msgid "Guardian"
 msgstr "Erziehungsberechtigter"
 
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:29
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:82
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:29
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:82
 msgid "Financial details"
 msgstr "Angaben zur Bezahlung"
 
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:33
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:86
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:33
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:86
 msgid "Accept SEPA"
 msgstr "SEPA-Lastschriftmandat"
 
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:37
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:90
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:37
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:90
 msgid "Additional"
 msgstr "Zusätzliches"
 
-#: aleksis/apps/paweljong/templates/templated_email/event_registred.email:58
+#: aleksis/apps/paweljong/templates/templated_email/event_registered.email:58
 #, python-format
 msgid "New registration: %(registration)s"
 msgstr "Neue Anmeldung: %(registration)s"
@@ -1132,12 +1132,12 @@ msgid "You have successfully registered for the event. Please give us up to two
 msgstr "Du hast dich erfolgreich zu der Veranstaltung angemeldet. Bitte gib uns ein paar Tage, um deine Anmeldung zu bearbeiten. Du wirst dann eine E-Mail von uns bekommen."
 
 #: aleksis/apps/paweljong/views.py:600
-msgid "You registred for an event"
+msgid "You registered for an event"
 msgstr "Du hast dich zu einer Veranstaltung angemeldet"
 
 #: aleksis/apps/paweljong/views.py:601
 #, python-format
-msgid "You registred for the event %s"
+msgid "You registered for the event %s"
 msgstr "Du hast dich zur Veranstaltung %s angemeldet"
 
 #: aleksis/apps/paweljong/views.py:657

aleksis/apps/paweljong/migrations/0001_initial.py

@@ -80,7 +80,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', models.JSONField(default=dict, editable=False)),
-                ('date_registred', models.DateTimeField(auto_now_add=True, verbose_name='Registration date')),
+                ('date_registered', models.DateTimeField(auto_now_add=True, verbose_name='Registration date')),
                 ('comment', models.TextField(blank=True, default='', verbose_name='Comment / remarks')),
                 ('channel', models.CharField(blank=True, default='', max_length=255, verbose_name='Channel')),
                 ('donation', models.PositiveIntegerField(blank=True, null=True, verbose_name='Donation')),

aleksis/apps/paweljong/models.py

@@ -124,7 +124,7 @@ class EventRegistration(ExtensibleModel):
 
     event = models.ForeignKey(Event, on_delete=models.CASCADE, verbose_name=_("Event"))
     person = models.ForeignKey(Person, on_delete=models.CASCADE, verbose_name=_("Person"))
-    date_registred = models.DateTimeField(auto_now_add=True, verbose_name=_("Registration date"))
+    date_registered = models.DateTimeField(auto_now_add=True, verbose_name=_("Registration date"))
 
     school = models.CharField(verbose_name=_("Name of school"), max_length=255)
     school_class = models.CharField(verbose_name=_("School class"), max_length=255)

aleksis/apps/paweljong/tables.py

@@ -49,7 +49,7 @@ class EventRegistrationsTable(tables.Table):
 
     person = tables.Column()
     event = tables.Column()
-    date_registred = tables.Column()
+    date_registered = tables.Column()
     view = tables.LinkColumn(
         "registration_by_pk",
         args=[A("id")],

aleksis/apps/paweljong/views.py

@@ -22,7 +22,7 @@ from aleksis.apps.postbuero.models import MailAddress
 from aleksis.core.mixins import AdvancedCreateView, AdvancedDeleteView, AdvancedEditView
 from aleksis.core.models import Activity, Person
 from aleksis.core.util import messages
-from aleksis.core.util.core_helpers import lazy_preference, objectgetter_optional
+from aleksis.core.util.core_helpers import get_site_preferences, objectgetter_optional
 
 from .filters import EventFilter, EventRegistrationFilter, VoucherFilter
 from .forms import (
@@ -261,13 +261,13 @@ def is_person_anonymous(wizard):
 
 
 def set_email_needed(request, slug):
-    request.session["email_needed"] = "true"
+    request.session["email_needed"] = True
 
     return redirect("register_event_by_slug", slug)
 
 
 def is_email_needed(wizard):
-    if wizard.request.session.get("email_needed"):
+    if hasattr(wizard.request.session, "email_needed"):
         wizard.request.session.pop("email_needed")
         return True
 
@@ -447,7 +447,7 @@ class RegisterEventWizardView(SessionWizardView):
         cleaned_data_financial = self.get_cleaned_data_for_step("financial")
         cleaned_data_consent = self.get_cleaned_data_for_step("consent")
 
-        if cleaned_data_financial["voucher_code"] != "":
+        if cleaned_data_financial["voucher_code"]:
             vouchers = Voucher.objects.filter(
                 person=person, event=event, used=False, code=cleaned_data_financial["voucher_code"]
             )
@@ -513,10 +513,8 @@ class RegisterEventWizardView(SessionWizardView):
             or "guardian_mobile_number" in cleaned_data_guardians
             or "guardian_email" in cleaned_data_guardians
         ):
-            guardian = Person.objects.get_or_create(
+            guardian, created = Person.objects.get_or_create(
                 defaults={
-                    "first_name": cleaned_data_guardians["guardian_first_name"],
-                    "last_name": cleaned_data_guardians["guardian_last_name"],
                     "mobile_number": cleaned_data_guardians["guardian_mobile_number"],
                 },
                 first_name=cleaned_data_guardians["guardian_first_name"],
@@ -524,7 +522,7 @@ class RegisterEventWizardView(SessionWizardView):
                 email=cleaned_data_guardians["guardian_email"],
             )
 
-            person.guardians.add(guardian[0])
+            person.guardians.add(guardian)
             person.save()
 
         if cleaned_data_email:
@@ -557,7 +555,7 @@ class RegisterEventWizardView(SessionWizardView):
 
         registration.save()
 
-        if cleaned_data_financial["voucher_code"] != "":
+        if cleaned_data_financial["voucher_code"]:
             vouchers = Voucher.objects.filter(
                 person=person, event=event, used=False, code=cleaned_data_financial["voucher_code"]
             )
@@ -575,8 +573,8 @@ class RegisterEventWizardView(SessionWizardView):
         context["registration"] = registration
 
         send_templated_mail(
-            template_name="event_registred",
-            from_email=lazy_preference("mail", "address"),
+            template_name="event_registered",
+            from_email=get_site_preferences()["mail__address"],
             recipient_list=["orga@teckids.org"],
             headers={
                 "reply_to": [
@@ -597,12 +595,11 @@ class RegisterEventWizardView(SessionWizardView):
         )
 
         act = Activity(
-            title=_("You registred for an event"),
-            description=_("You registred for the event %s" % event.display_name),
+            title=_("You registered for an event"),
+            description=_("You registered for the event %s" % event.display_name),
             app="Paweljong",
             user=person,
         )
-        act.save()
 
         return redirect("index")