From 65de4ed8d1514a8b49c636e387c546fad8d72fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Tue, 4 Oct 2016 21:41:31 +0200
Subject: [PATCH] render messages as markdown

---
 conversations/templates/conversations/_message_detail.html    | 4 +++-
 conversations/templates/conversations/emails/message.html     | 2 +-
 .../templates/conversations/emails/talk_notification.html     | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/conversations/templates/conversations/_message_detail.html b/conversations/templates/conversations/_message_detail.html
index 090db4f..143407c 100644
--- a/conversations/templates/conversations/_message_detail.html
+++ b/conversations/templates/conversations/_message_detail.html
@@ -1,8 +1,10 @@
+{% load proposals_tags %}
+
 <div class="panel panel-{% block panelstyleblock %}default{% endblock %}">
   <div class="panel-heading">
     {{ message.created }} | <a href="{% url 'show-speaker' message.author.username %}">{{ message.author.profile }}</a>
   </div>
   <div class="panel-body">
-    {{ message.content|linebreaksbr }}
+    {% markdown message.content %}
   </div>
 </div>
diff --git a/conversations/templates/conversations/emails/message.html b/conversations/templates/conversations/emails/message.html
index af1a03d..142d995 100644
--- a/conversations/templates/conversations/emails/message.html
+++ b/conversations/templates/conversations/emails/message.html
@@ -1,4 +1,4 @@
-{{ content|linebreaksbr }}
+{% load proposals_tags %}{% markdown content %}
 
 <hr>
 {% if answering %}
diff --git a/conversations/templates/conversations/emails/talk_notification.html b/conversations/templates/conversations/emails/talk_notification.html
index 1db0dae..a8056ae 100644
--- a/conversations/templates/conversations/emails/talk_notification.html
+++ b/conversations/templates/conversations/emails/talk_notification.html
@@ -1,11 +1,11 @@
-Hi!<br />
+{% load proposals_tags %}Hi!<br />
 <br />
 A <a href="https://{{ uri }}">new {{ talk.event }}</a> has been proposed by <a href="https://{{ proposer_uri }}">{{ proposer.profile }}</a>!<br />
 <br />
 Title: {{ talk.title }}<br />
 <br />
 Description:<br />
-<p>{{ talk.description|linebreaksbr }}</p>
+<p>{% markdown talk.description %}</p>
 {% if answering %}
 <hr>
 Reply to this email directly to comment this talk.{% endif %}