Add more descriptions and translations

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 (file)
index 0000000..eff562a
--- /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 1751a5e89393fbb3a2864a4047fd7b80fb524eb7..e22b59473661e8f0368e7323aff4658790ef3379 100644 (file)
--- 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 e1c3d0a417fddcee9e705ceaaeb5c7d219cc9493..54d87ff1da9afab1550ae89afaace929001849d7 100644 (file)
--- 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 (file)
index 0000000..545207b
--- /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 e7f95411dae12418c8282c983a652f2536d88a02..f01613412c0f9ec31f1a2d947b33c50d9ac1c24c 100644 (file)
--- 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 cc42b392726a89547e4015b067406c179bcba562..433dd153b04c72b1b9359cc1ad242b0de9af9f25 100644 (file)
--- 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',)