diff --git a/input/forms.py b/input/forms.py index 62b0b8b..913ac49 100755 --- a/input/forms.py +++ b/input/forms.py @@ -125,6 +125,11 @@ class ProjectForm(BaseProjectForm, BaseApplicationForm): 'insurance', 'notes', ] + labels = { + 'cost': 'Kosten in Euro', + 'insurance': 'Haftpflicht- und Unfallversicherung gewünscht', + 'participants_estimated': 'Voraussichtliche Zahl der Teilnehmenden', + } widgets = { 'start': AdminDateWidget, 'end': AdminDateWidget, @@ -178,6 +183,10 @@ class TravelForm(BaseApplicationForm): 'hotel', 'notes', ] + labels = { + 'checkin': 'Datum der Anreise', + 'checkout': 'Datum der Abreise', + } widgets = { 'checkin': AdminDateWidget, 'checkout': AdminDateWidget, @@ -202,6 +211,9 @@ class LibraryForm(BaseApplicationForm): 'duration', 'notes', ] + labels = { + 'cost': 'Kosten in Euro', + } def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/input/migrations/0063_businesscard_url_of_pic_alter_ifg_notes_and_more.py b/input/migrations/0063_businesscard_url_of_pic_alter_ifg_notes_and_more.py index 0a2427f..b1d4f0c 100755 --- a/input/migrations/0063_businesscard_url_of_pic_alter_ifg_notes_and_more.py +++ b/input/migrations/0063_businesscard_url_of_pic_alter_ifg_notes_and_more.py @@ -18,12 +18,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='ifg', name='notes', - field=models.TextField(blank=True, help_text='Bitte gib an wofür Du das Stipendium verwenden willst.', max_length=1000, verbose_name='Anmerkungen'), + field=models.TextField(blank=True, help_text='Bitte gib an, wofür Du das Stipendium verwenden willst.', max_length=1000, verbose_name='Anmerkungen'), ), migrations.AlterField( model_name='library', name='notes', - field=models.TextField(blank=True, help_text='Bitte gib an wofür Du das Stipendium verwenden willst.', max_length=1000, verbose_name='Anmerkungen'), + field=models.TextField(blank=True, help_text='Bitte gib an, wofür Du das Stipendium verwenden willst.', max_length=1000, verbose_name='Anmerkungen'), ), migrations.AlterField( model_name='library', @@ -33,7 +33,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='literature', name='notes', - field=models.TextField(blank=True, help_text='Bitte gib an wofür Du das Stipendium verwenden willst.', max_length=1000, verbose_name='Anmerkungen'), + field=models.TextField(blank=True, help_text='Bitte gib an, wofür Du das Stipendium verwenden willst.', max_length=1000, verbose_name='Anmerkungen'), ), migrations.AlterField( model_name='project', diff --git a/input/migrations/0100_projectcategory_wikimedia_project.py b/input/migrations/0100_projectcategory_wikimedia_project.py index 1160183..84494d1 100644 --- a/input/migrations/0100_projectcategory_wikimedia_project.py +++ b/input/migrations/0100_projectcategory_wikimedia_project.py @@ -65,8 +65,8 @@ class Migration(migrations.Migration): ('order', models.PositiveIntegerField(verbose_name='Reihenfolge')), ], options={ - 'verbose_name': 'Wikimedia Projekt', - 'verbose_name_plural': 'Wikimedia Projekte', + 'verbose_name': 'Wikimedia-Projekt', + 'verbose_name_plural': 'Wikimedia-Projekte', 'ordering': ['order'], }, ), diff --git a/input/migrations/0101_wikimedia_project_categories_and_other.py b/input/migrations/0101_wikimedia_project_categories_and_other.py index 9190355..d1c8de7 100644 --- a/input/migrations/0101_wikimedia_project_categories_and_other.py +++ b/input/migrations/0101_wikimedia_project_categories_and_other.py @@ -24,11 +24,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='project', name='wikimedia_projects', - field=input.models.ProjectCategoryField(related_name='projects', to='input.wikimediaproject', verbose_name='Wikimedia Projekte'), + field=input.models.ProjectCategoryField(related_name='projects', to='input.wikimediaproject', verbose_name='Wikimedia-Projekte'), ), migrations.AddField( model_name='project', name='wikimedia_projects_other', - field=models.CharField(blank=True, max_length=200, verbose_name='Wikimedia Projekte (Anderes)'), + field=models.CharField(blank=True, max_length=200, verbose_name='Wikimedia-Projekte (Anderes)'), ), ] diff --git a/input/models.py b/input/models.py index 8a92f3c..82587b7 100755 --- a/input/models.py +++ b/input/models.py @@ -142,8 +142,8 @@ class WikimediaProject(BaseProjectCategory): OTHER = 'Anderes' class Meta(BaseProjectCategory.Meta): - verbose_name = 'Wikimedia Projekt' - verbose_name_plural = 'Wikimedia Projekte' + verbose_name = 'Wikimedia-Projekt' + verbose_name_plural = 'Wikimedia-Projekte' class ProductCategoryChoiceIterator(ModelMultipleChoiceField.iterator): @@ -400,7 +400,7 @@ class Grant(RequestUrlMixin, Extern): cost = models.CharField(max_length=10, verbose_name='Kosten', help_text='Bitte gib die ungefähr zu erwartenden Kosten in Euro an.') notes = models.TextField(max_length=1000, blank=True, verbose_name='Anmerkungen', - help_text='Bitte gib an wofür Du das Stipendium verwenden willst.') + help_text='Bitte gib an, wofür Du das Stipendium verwenden willst.') class Meta: abstract = True