From b4b35aa486f440637d33796b22f22cb0c884440c Mon Sep 17 00:00:00 2001 From: Oliver Zander Date: Fri, 7 Nov 2025 16:32:01 +0100 Subject: [PATCH] removed duplicate trailing colons in labels --- input/migrations/0027_businesscard_email_list.py | 2 +- input/migrations/0028_auto_20201027_1131.py | 2 +- input/migrations/0054_auto_20201118_1702.py | 2 +- .../0067_travel_project_name_alter_library_type.py | 2 +- input/migrations/0068_travel_hotel.py | 2 +- input/migrations/0069_alter_travel_transport.py | 2 +- input/migrations/0088_auto_20221208_2128.py | 2 +- input/models.py | 8 ++++---- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/input/migrations/0027_businesscard_email_list.py b/input/migrations/0027_businesscard_email_list.py index 0a20499..710f04e 100755 --- a/input/migrations/0027_businesscard_email_list.py +++ b/input/migrations/0027_businesscard_email_list.py @@ -38,7 +38,7 @@ class Migration(migrations.Migration): ('survey_mail_send', models.BooleanField(null=True)), ('username', models.CharField(max_length=200, null=True)), ('domain', models.CharField(choices=[('PEDIA', '@wikipedia.de'), ('BOOKS', '@wikibooks.de'), ('QUOTE', '@wikiquote.de'), ('SOURCE', '@wikisource.de'), ('VERSITY', '@wikiversity.de')], default='PEDIA', max_length=10)), - ('adress', models.CharField(choices=[('REALNAME', 'Vorname.Nachname'), ('USERNAME', 'Username'), ('OTHER', 'Sonstiges:')], default='USERNAME', max_length=50)), + ('adress', models.CharField(choices=[('REALNAME', 'Vorname.Nachname'), ('USERNAME', 'Username'), ('OTHER', 'Sonstiges')], default='USERNAME', max_length=50)), ('other', models.CharField(blank=True, max_length=50, null=True)), ], options={ diff --git a/input/migrations/0028_auto_20201027_1131.py b/input/migrations/0028_auto_20201027_1131.py index 3a6f57f..8405e1c 100755 --- a/input/migrations/0028_auto_20201027_1131.py +++ b/input/migrations/0028_auto_20201027_1131.py @@ -45,7 +45,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='email', name='address', - field=models.CharField(choices=[('REALNAME', 'Vorname.Nachname'), ('USERNAME', 'Username'), ('OTHER', 'Sonstiges:')], default='USERNAME', max_length=50, verbose_name='Adressbestandteil'), + field=models.CharField(choices=[('REALNAME', 'Vorname.Nachname'), ('USERNAME', 'Username'), ('OTHER', 'Sonstiges')], default='USERNAME', max_length=50, verbose_name='Adressbestandteil'), ), migrations.AddField( model_name='list', diff --git a/input/migrations/0054_auto_20201118_1702.py b/input/migrations/0054_auto_20201118_1702.py index 817f419..eb9c62e 100755 --- a/input/migrations/0054_auto_20201118_1702.py +++ b/input/migrations/0054_auto_20201118_1702.py @@ -13,7 +13,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='email', name='address', - field=models.CharField(choices=[('REALNAME', 'Vorname.Nachname'), ('USERNAME', 'Username'), ('OTHER', 'Sonstiges:')], default='USERNAME', help_text='Bitte gib hier den gewünschten Adressbestandteil an,
der sich vor der Domain befinden soll.', max_length=50, verbose_name='Adressbestandteil'), + field=models.CharField(choices=[('REALNAME', 'Vorname.Nachname'), ('USERNAME', 'Username'), ('OTHER', 'Sonstiges')], default='USERNAME', help_text='Bitte gib hier den gewünschten Adressbestandteil an,
der sich vor der Domain befinden soll.', max_length=50, verbose_name='Adressbestandteil'), ), migrations.AlterField( model_name='email', diff --git a/input/migrations/0067_travel_project_name_alter_library_type.py b/input/migrations/0067_travel_project_name_alter_library_type.py index 5cbcb7a..562c1f3 100755 --- a/input/migrations/0067_travel_project_name_alter_library_type.py +++ b/input/migrations/0067_travel_project_name_alter_library_type.py @@ -13,7 +13,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='travel', name='project_name', - field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Projektname:'), + field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Projektname'), ), migrations.AlterField( model_name='library', diff --git a/input/migrations/0068_travel_hotel.py b/input/migrations/0068_travel_hotel.py index 82fd575..d21606b 100755 --- a/input/migrations/0068_travel_hotel.py +++ b/input/migrations/0068_travel_hotel.py @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='travel', name='hotel', - field=models.BooleanField(default=False, verbose_name='Hotelzimmer benötigt:'), + field=models.BooleanField(default=False, verbose_name='Hotelzimmer benötigt'), ), ] diff --git a/input/migrations/0069_alter_travel_transport.py b/input/migrations/0069_alter_travel_transport.py index 77538db..85a81ca 100755 --- a/input/migrations/0069_alter_travel_transport.py +++ b/input/migrations/0069_alter_travel_transport.py @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='travel', name='transport', - field=models.CharField(choices=[('BAHN', 'Bahn'), ('NONE', 'Keine Fahrtkosten'), ('OTHER', 'Sonstiges (mit Begründung)')], default='BAHN', max_length=5, verbose_name='Transportmittel:'), + field=models.CharField(choices=[('BAHN', 'Bahn'), ('NONE', 'Keine Fahrtkosten'), ('OTHER', 'Sonstiges (mit Begründung)')], default='BAHN', max_length=5, verbose_name='Transportmittel'), ), ] diff --git a/input/migrations/0088_auto_20221208_2128.py b/input/migrations/0088_auto_20221208_2128.py index 9291efe..7b90c49 100644 --- a/input/migrations/0088_auto_20221208_2128.py +++ b/input/migrations/0088_auto_20221208_2128.py @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='travel', name='hotel', - field=models.CharField(choices=[('TRUE', 'Hotelzimmer benötigt'), ('FALSE', 'Kein Hotelzimmer benötigt')], max_length=10, verbose_name='Hotelzimmer benötigt:'), + field=models.CharField(choices=[('TRUE', 'Hotelzimmer benötigt'), ('FALSE', 'Kein Hotelzimmer benötigt')], max_length=10, verbose_name='Hotelzimmer benötigt'), ), ] diff --git a/input/models.py b/input/models.py index e7cedf7..5fd8474 100755 --- a/input/models.py +++ b/input/models.py @@ -371,15 +371,15 @@ HOTEL_CHOICES = { class Travel(Extern): # project variable is now null true and blank true, which means it can be saved without project id to be later on filled out by admins project = models.ForeignKey(Project, on_delete=models.CASCADE, null=True, blank=True) - project_name = models.CharField(max_length=50, null=True, blank=True, verbose_name='Projektname:') - transport = models.CharField(max_length=5, choices=TRANSPORT_CHOICES.items(), default='BAHN', verbose_name='Transportmittel:') + project_name = models.CharField(max_length=50, null=True, blank=True, verbose_name='Projektname') + transport = models.CharField(max_length=5, choices=TRANSPORT_CHOICES.items(), default='BAHN', verbose_name='Transportmittel') other_transport = models.CharField(max_length=200, null=True, blank=True, verbose_name='Sonstige Transportmittel (mit Begründung)') travelcost = models.CharField(max_length=10, default='0', verbose_name='Fahrtkosten') checkin = models.DateField(blank=True, null=True, verbose_name='Anreise') checkout = models.DateField(blank=True, null=True, verbose_name='Abreise') payed_for_hotel_by = models.CharField(max_length=4, choices=PAYEDBY_CHOICES.items(), blank=True, null=True, verbose_name='Kostenauslage Hotel durch') payed_for_travel_by = models.CharField(max_length=4, choices=PAYEDBY_CHOICES.items(), blank=True, null=True, verbose_name='Kostenauslage Fahrt durch') - hotel = models.CharField(max_length=10, choices=HOTEL_CHOICES.items(), verbose_name='Hotelzimmer benötigt:') + hotel = models.CharField(max_length=10, choices=HOTEL_CHOICES.items(), verbose_name='Hotelzimmer benötigt') notes = models.TextField(max_length=1000, blank=True, verbose_name='Anmerkungen') request_url = models.URLField(max_length=2000, verbose_name='Antrag (URL)') intern_notes = models.TextField(max_length=1000, blank=True, verbose_name='interne Anmerkungen') @@ -531,7 +531,7 @@ class Domain(RequestUrlMixin, Extern): MAIL_CHOICES = { 'REALNAME': 'Vorname.Nachname', 'USERNAME': 'Username', - 'OTHER': 'Sonstiges:', + 'OTHER': 'Sonstiges', } ADULT_CHOICES = {