From 9b629cb80b7e2ab6d73d6ef2c79ee9b3580b84d4 Mon Sep 17 00:00:00 2001 From: Mindiell Date: Thu, 22 Feb 2024 13:53:21 +0100 Subject: [PATCH] feat: Language added for talks. Closing #28 --- cfp/forms.py | 2 +- .../0028_alter_volunteer_phone_number.py | 19 +++++++++++++++++++ cfp/migrations/0029_talk_language.py | 18 ++++++++++++++++++ cfp/models.py | 1 + cfp/templates/cfp/staff/talk_list.html | 2 ++ 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 cfp/migrations/0028_alter_volunteer_phone_number.py create mode 100644 cfp/migrations/0029_talk_language.py diff --git a/cfp/forms.py b/cfp/forms.py index f650e8b..50fe27c 100644 --- a/cfp/forms.py +++ b/cfp/forms.py @@ -86,7 +86,7 @@ class TalkForm(forms.ModelForm): class Meta: model = Talk - fields = ('category', 'title', 'description', 'notes', 'materials',) + fields = ('category', 'title', 'language', 'description', 'notes', 'materials',) class TalkStaffForm(forms.ModelForm): diff --git a/cfp/migrations/0028_alter_volunteer_phone_number.py b/cfp/migrations/0028_alter_volunteer_phone_number.py new file mode 100644 index 0000000..921aad7 --- /dev/null +++ b/cfp/migrations/0028_alter_volunteer_phone_number.py @@ -0,0 +1,19 @@ +# Generated by Django 4.1.7 on 2024-02-22 12:43 + +import cfp.models +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cfp', '0027_auto_20200809_1530'), + ] + + operations = [ + migrations.AlterField( + model_name='volunteer', + name='phone_number', + field=models.CharField(blank=True, default='', max_length=64, validators=[cfp.models.validate_phone_number], verbose_name='Phone number'), + ), + ] diff --git a/cfp/migrations/0029_talk_language.py b/cfp/migrations/0029_talk_language.py new file mode 100644 index 0000000..f4cc84c --- /dev/null +++ b/cfp/migrations/0029_talk_language.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1.7 on 2024-02-22 12:45 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cfp', '0028_alter_volunteer_phone_number'), + ] + + operations = [ + migrations.AddField( + model_name='talk', + name='language', + field=models.CharField(blank=True, max_length=10), + ), + ] diff --git a/cfp/models.py b/cfp/models.py index 55d9917..0babb2c 100644 --- a/cfp/models.py +++ b/cfp/models.py @@ -364,6 +364,7 @@ class Talk(PonyConfModel): video = models.URLField(max_length=1000, blank=True, default='', verbose_name='Video URL') token = models.UUIDField(default=uuid.uuid4, editable=False, unique=True) conversation = models.OneToOneField(MessageThread, on_delete=models.PROTECT) + language = models.CharField(max_length=10, blank=True) objects = TalkManager() diff --git a/cfp/templates/cfp/staff/talk_list.html b/cfp/templates/cfp/staff/talk_list.html index 1a5ef33..6a864dd 100644 --- a/cfp/templates/cfp/staff/talk_list.html +++ b/cfp/templates/cfp/staff/talk_list.html @@ -55,6 +55,7 @@ {% trans "Title" %} {% trans "Intervention kind" %} {% trans "Speakers" %} + {% trans "Language" %} {% trans "Track" %} {% trans "Tags" %} {% trans "Status" %} @@ -83,6 +84,7 @@ {% empty %}– {% endfor %} + {{ talk.language }} {{ talk.track|default:"–" }} {{ talk.get_tags_html }} {{ talk.get_status_str }}