diff --git a/webapp/admin.py b/webapp/admin.py index dd0c36f..04d51cf 100644 --- a/webapp/admin.py +++ b/webapp/admin.py @@ -16,7 +16,7 @@ admin.site.register(Event, TranslationAdmin) admin.site.register(SignupForm, TranslationAdmin) admin.site.register(Signup, TranslationAdmin) admin.site.register(TemplateQuestion, TranslationAdmin) +admin.site.register(Committee, TranslationAdmin) admin.site.register(Official) admin.site.register(Occupation) admin.site.register(Role) -admin.site.register(Committee) diff --git a/webapp/migrations/0059_auto_20191010_1900.py b/webapp/migrations/0059_auto_20191010_1900.py new file mode 100644 index 0000000..8fc9972 --- /dev/null +++ b/webapp/migrations/0059_auto_20191010_1900.py @@ -0,0 +1,23 @@ +# Generated by Django 2.1.5 on 2019-10-10 16:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('webapp', '0058_auto_20191010_1837'), + ] + + operations = [ + migrations.AddField( + model_name='committee', + name='name_en', + field=models.CharField(max_length=255, null=True, verbose_name='Name'), + ), + migrations.AddField( + model_name='committee', + name='name_fi', + field=models.CharField(max_length=255, null=True, verbose_name='Name'), + ), + ] diff --git a/webapp/serializers.py b/webapp/serializers.py index 03f8f1f..b4db898 100644 --- a/webapp/serializers.py +++ b/webapp/serializers.py @@ -96,7 +96,7 @@ class FeedSerializer(serializers.ModelSerializer): class CommitteeSerializer(serializers.ModelSerializer): class Meta: model = Committee - fields = ['name'] + fields = ['name_fi', 'name_en'] class RoleSerializer(serializers.ModelSerializer): @@ -104,7 +104,7 @@ class RoleSerializer(serializers.ModelSerializer): class Meta: model = Role - fields = ('name', 'description', 'committee') + fields = ('name_fi', 'name_en', 'description_fi', 'description_en', 'committee') class ContactsSerializer(serializers.ModelSerializer): diff --git a/webapp/translation.py b/webapp/translation.py index 73713ca..24c4b62 100644 --- a/webapp/translation.py +++ b/webapp/translation.py @@ -1,8 +1,7 @@ """Translation classes.""" from modeltranslation.translator import register, TranslationOptions -from webapp.models import BaseFeed, Feed, Tag, Event, Signup, SignupForm, TemplateQuestion -from webapp.models import PresetRole, BaseRole +from webapp.models import * @register(BaseFeed) @@ -66,3 +65,10 @@ class PresetRoleTranslationOptions(TranslationOptions): """Class for PresetRole translation options.""" fields = ('description',) + + +@register(Committee) +class CommitteeTranslationOptions(TranslationOptions): + """Class for PresetRole translation options.""" + + fields = ('name',)