From 2458ade2a9a5ac9e682f4adae74d653530fd8260 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 29 Sep 2016 18:35:27 +0200 Subject: [PATCH] Add more descriptions and translations --- .../job/migrations/0003_auto_20160929_1833.py | 25 +++++++ app/organization/job/translation.py | 2 +- app/organization/media/admin.py | 15 +++-- .../migrations/0003_auto_20160929_1835.py | 65 +++++++++++++++++++ app/organization/media/models.py | 4 +- app/organization/media/translation.py | 12 ++++ 6 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 app/organization/job/migrations/0003_auto_20160929_1833.py create mode 100644 app/organization/media/migrations/0003_auto_20160929_1835.py diff --git a/app/organization/job/migrations/0003_auto_20160929_1833.py b/app/organization/job/migrations/0003_auto_20160929_1833.py new file mode 100644 index 00000000..eff562a6 --- /dev/null +++ b/app/organization/job/migrations/0003_auto_20160929_1833.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-09-29 16:33 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-job', '0002_jobresponse_message'), + ] + + operations = [ + migrations.AddField( + model_name='joboffer', + name='description_en', + field=models.TextField(blank=True, null=True, verbose_name='Description'), + ), + migrations.AddField( + model_name='joboffer', + name='description_fr', + field=models.TextField(blank=True, null=True, verbose_name='Description'), + ), + ] diff --git a/app/organization/job/translation.py b/app/organization/job/translation.py index 1751a5e8..e22b5947 100644 --- a/app/organization/job/translation.py +++ b/app/organization/job/translation.py @@ -7,7 +7,7 @@ from organization.job.models import * @register(JobOffer) class JobOfferTranslationOptions(TranslationOptions): - fields = ('title', 'content') + fields = ('title', 'description', 'content') @register(JobResponse) diff --git a/app/organization/media/admin.py b/app/organization/media/admin.py index e1c3d0a4..54d87ff1 100644 --- a/app/organization/media/admin.py +++ b/app/organization/media/admin.py @@ -1,27 +1,32 @@ from copy import deepcopy from django.contrib import admin -from mezzanine.core.admin import DisplayableAdmin, OwnableAdmin +from mezzanine.core.admin import * from organization.media.models import * -class VideoAdmin(admin.ModelAdmin): +class VideoAdmin(BaseTranslationModelAdmin): model = Video -class AudioAdmin(admin.ModelAdmin): +class AudioAdmin(BaseTranslationModelAdmin): model = Audio -class PlaylistAdmin(admin.ModelAdmin): +class PlaylistAdmin(BaseTranslationModelAdmin): model = Playlist list_display = ('__str__',) filter_horizontal = ['audios'] +class MediaCategoryAdmin(BaseTranslationModelAdmin): + + model = MediaCategory + + admin.site.register(Video, VideoAdmin) admin.site.register(Audio, AudioAdmin) admin.site.register(Playlist, PlaylistAdmin) -admin.site.register(MediaCategory) +admin.site.register(MediaCategory, MediaCategoryAdmin) diff --git a/app/organization/media/migrations/0003_auto_20160929_1835.py b/app/organization/media/migrations/0003_auto_20160929_1835.py new file mode 100644 index 00000000..545207b4 --- /dev/null +++ b/app/organization/media/migrations/0003_auto_20160929_1835.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-09-29 16:35 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-media', '0002_auto_20160929_1310'), + ] + + operations = [ + migrations.AddField( + model_name='mediacategory', + name='description', + field=models.TextField(blank=True, verbose_name='description'), + ), + migrations.AddField( + model_name='mediacategory', + name='description_en', + field=models.TextField(blank=True, null=True, verbose_name='description'), + ), + migrations.AddField( + model_name='mediacategory', + name='description_fr', + field=models.TextField(blank=True, null=True, verbose_name='description'), + ), + migrations.AddField( + model_name='mediacategory', + name='title_en', + field=models.CharField(max_length=500, null=True, verbose_name='Title'), + ), + migrations.AddField( + model_name='mediacategory', + name='title_fr', + field=models.CharField(max_length=500, null=True, verbose_name='Title'), + ), + migrations.AddField( + model_name='playlist', + name='description', + field=models.TextField(blank=True, verbose_name='description'), + ), + migrations.AddField( + model_name='playlist', + name='description_en', + field=models.TextField(blank=True, null=True, verbose_name='description'), + ), + migrations.AddField( + model_name='playlist', + name='description_fr', + field=models.TextField(blank=True, null=True, verbose_name='description'), + ), + migrations.AddField( + model_name='playlist', + name='title_en', + field=models.CharField(max_length=500, null=True, verbose_name='Title'), + ), + migrations.AddField( + model_name='playlist', + name='title_fr', + field=models.CharField(max_length=500, null=True, verbose_name='Title'), + ), + ] diff --git a/app/organization/media/models.py b/app/organization/media/models.py index e7f95411..f0161341 100644 --- a/app/organization/media/models.py +++ b/app/organization/media/models.py @@ -81,7 +81,7 @@ class Video(Media): return reverse("festival-video-detail", kwargs={"slug": self.slug}) -class MediaCategory(Slugged): +class MediaCategory(Slugged, Description): """Media Category""" class Meta: @@ -95,7 +95,7 @@ class MediaCategory(Slugged): return self.audios.published().count()+1 -class Playlist(Slugged): +class Playlist(Slugged, Description): """(Playlist description)""" audios = models.ManyToManyField('Audio', verbose_name=_('audios'), related_name='playlists', blank=True) diff --git a/app/organization/media/translation.py b/app/organization/media/translation.py index cc42b392..433dd153 100644 --- a/app/organization/media/translation.py +++ b/app/organization/media/translation.py @@ -12,4 +12,16 @@ class VideoTranslationOptions(TranslationOptions): @register(Audio) class AudioTranslationOptions(TranslationOptions): + fields = ('title', 'description',) + + +@register(Playlist) +class PlaylistTranslationOptions(TranslationOptions): + + fields = ('title', 'description',) + + +@register(MediaCategory) +class MediaCategoryTranslationOptions(TranslationOptions): + fields = ('title', 'description',) -- 2.39.5