From 02e7686760b57dd6a7f40b93b0867510c1b5fa74 Mon Sep 17 00:00:00 2001 From: heinzel Date: Mon, 8 May 2023 13:26:37 +0200 Subject: [PATCH] Fixed typo in "Schwierigkeitsniveau" --- dav_events/forms/events.py | 2 +- .../migrations/0044_alter_event_level.py | 18 ++++++++++++++++++ dav_events/models/event.py | 2 +- .../templates/dav_events/event/default.txt | 2 +- dav_events/tests/test_emails.py | 2 +- 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 dav_events/migrations/0044_alter_event_level.py diff --git a/dav_events/forms/events.py b/dav_events/forms/events.py index 2b83268..ff3d2c7 100644 --- a/dav_events/forms/events.py +++ b/dav_events/forms/events.py @@ -227,7 +227,7 @@ class ModeForm(EventCreateForm): ) level = forms.ChoiceField(choices=choices.LEVEL_CHOICES, - label=_(u'Schwierigkeitsnivau / Familien'), + label=_(u'Schwierigkeitsniveau / Familien'), widget=forms.RadioSelect()) first_day = forms.DateField(required=True, diff --git a/dav_events/migrations/0044_alter_event_level.py b/dav_events/migrations/0044_alter_event_level.py new file mode 100644 index 0000000..72f612d --- /dev/null +++ b/dav_events/migrations/0044_alter_event_level.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.13 on 2023-05-08 11:23 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dav_events', '0043_alter_event_level'), + ] + + operations = [ + migrations.AlterField( + model_name='event', + name='level', + field=models.CharField(choices=[('beginner', 'Anfänger'), ('advanced', 'Fortgeschrittene'), ('family', 'Familien')], max_length=25, verbose_name='Schwierigkeitsniveau'), + ), + ] diff --git a/dav_events/models/event.py b/dav_events/models/event.py index 01fcc02..61637b4 100644 --- a/dav_events/models/event.py +++ b/dav_events/models/event.py @@ -57,7 +57,7 @@ class Event(models.Model): verbose_name=_('Skiliftbenutzung')) level = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH, choices=choices.LEVEL_CHOICES, - verbose_name=_('Schwierigkeitsnivau')) + verbose_name=_('Schwierigkeitsniveau')) first_day = models.DateField(verbose_name=_('Erster Tag')) alt_first_day = models.DateField(blank=True, null=True, diff --git a/dav_events/templates/dav_events/event/default.txt b/dav_events/templates/dav_events/event/default.txt index c526db6..38e23c7 100644 --- a/dav_events/templates/dav_events/event/default.txt +++ b/dav_events/templates/dav_events/event/default.txt @@ -51,7 +51,7 @@ {% trans 'Nichtöffentliche Daten' %}: ======================= {% trans 'Veranstaltungsart' %}: {{ event.get_mode_display }} -{% trans 'Schwierigkeitsnivau' %}: {{ event.get_level_display }} +{% trans 'Schwierigkeitsniveau' %}: {{ event.get_level_display }} {% if event.sport == 'S' %}{% trans 'Skiliftbenutzung' %}: {% if event.ski_list %}{% trans 'Ja' %}{% else %}{% trans 'Nein' %}{% endif %} {% endif %}{% trans 'Gelände' %}: {{ event.get_terrain_display }} {% trans 'Anmeldung' %}: {% if registration_required %}{% if registration_closed %}{% trans 'Geschlossen' %}{% else %}{% trans 'Erforderlich' %}{% endif %}{% else %}{% trans 'Nicht erforderlich' %}{% endif %} diff --git a/dav_events/tests/test_emails.py b/dav_events/tests/test_emails.py index 91e9200..78a1211 100644 --- a/dav_events/tests/test_emails.py +++ b/dav_events/tests/test_emails.py @@ -47,7 +47,7 @@ Link zur Veranstaltung: Nichtöffentliche Daten: ======================= Veranstaltungsart: gemeinschaftliche Tour - Schwierigkeitsnivau: Anfänger + Schwierigkeitsniveau: Anfänger Gelände: Kletterhalle Anmeldung: Nicht erforderlich Anreise des Kurs-/Tourenleiters am Vortag: Nein