Brief: translating title + content

diff --git a/app/organization/magazine/migrations/0006_auto_20160924_1058.py b/app/organization/magazine/migrations/0006_auto_20160924_1058.py
new file mode 100644 (file)
index 0000000..896b10f
--- /dev/null
+++ b/app/organization/magazine/migrations/0006_auto_20160924_1058.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-24 08:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-magazine', '0005_auto_20160923_1821'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='brief',
+            name='title_en',
+            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
+        ),
+        migrations.AddField(
+            model_name='brief',
+            name='title_fr',
+            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
+        ),
+    ]

diff --git a/app/organization/magazine/migrations/0007_auto_20160924_1058.py b/app/organization/magazine/migrations/0007_auto_20160924_1058.py
new file mode 100644 (file)
index 0000000..00d79cb
--- /dev/null
+++ b/app/organization/magazine/migrations/0007_auto_20160924_1058.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-24 08:58
+from __future__ import unicode_literals
+
+from django.db import migrations
+import mezzanine.core.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-magazine', '0006_auto_20160924_1058'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='brief',
+            name='content_en',
+            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
+        ),
+        migrations.AddField(
+            model_name='brief',
+            name='content_fr',
+            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
+        ),
+    ]

diff --git a/app/organization/magazine/translation.py b/app/organization/magazine/translation.py
index 4e57c4e0cfc1b837ca38f07be7803e9947cec26e..266608bf2567c430c011bd947ae3104c715fb04e 100644 (file)
--- a/app/organization/magazine/translation.py
+++ b/app/organization/magazine/translation.py
@@ -16,7 +16,7 @@ class ArticleTranslationOptions(TranslationOptions):
 @register(Brief)
 class BriefTranslationOptions(TranslationOptions):
 
-    fields = ('text_button', )
+    fields = ('title', 'content', 'text_button', )
 
 
 @register(Topic)

diff --git a/app/templates/magazine/brief/inc/brief_card.html b/app/templates/magazine/brief/inc/brief_card.html
index ce0b038cd01af86c3ffb39bfc9a2c0e4a68a0178..dc07fc385ece8c6844108c038e07817f8df26ccf 100644 (file)
--- a/app/templates/magazine/brief/inc/brief_card.html
+++ b/app/templates/magazine/brief/inc/brief_card.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n mezzanine_tags %}
 
 <div class="brief-box">
 
@@ -8,7 +8,7 @@
 
     <h3 class="brief-box__title">{{content.content_object.title }}</h3>
     <div class="brief-box__desc">
-        {{content.content_object.description|slice:":500" }}
+        {{content.content_object.content|richtext_filters|safe|truncatechars_html:150 }}
     </div>
     {% if content.content_object.external_content %}
         <a class="brief-box__button" href="{{ content.content_object.external_content }}" title="{{ content.content_object.text_button }}">{{ content.content_object.text_button }}</a>