diff --git a/lms/djangoapps/discussion/signals/handlers.py b/lms/djangoapps/discussion/signals/handlers.py index e34e507a5f..d9d669b113 100644 --- a/lms/djangoapps/discussion/signals/handlers.py +++ b/lms/djangoapps/discussion/signals/handlers.py @@ -109,7 +109,7 @@ def create_message_context_for_reported_content(user, post, site, sender): 'thread_id': post.thread.id if sender == 'flag_abuse_for_comment' else post.id, 'title': post.thread.title if sender == 'flag_abuse_for_comment' else post.title, 'content_type': post.type, - 'comment_body': post.body, + 'content_body': post.body, 'thread_created_at': post.created_at, 'thread_commentable_id': post.commentable_id, 'site_id': site.id, diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html b/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html index 2ffba413a2..535f667dc9 100644 --- a/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html +++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.html @@ -10,16 +10,16 @@

{% filter force_escape %} {% blocktrans trimmed asvar replied_to_text %} - {{ course_name }} {{ course_id }} Reported content awaits review + {{ course_name }}: Reported content awaits review {% endblocktrans %} {% endfilter %} {% interpolate_html replied_to_text start_tag=''|safe end_tag=''|safe %}

You are receiving this email because the following {{ content_type }} was reported for review

-

Title

-
- {{ comment_body }} +

{{ title }}

+ + {{ content_body }} {% filter force_escape %} {% blocktrans asvar course_cta_text %}Go to Discussion{% endblocktrans %} diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt b/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt index 136662dfb1..ae4bbbdb41 100644 --- a/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt +++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/reportedcontentnotification/email/body.txt @@ -2,7 +2,7 @@ {% block content %} {% blocktrans trimmed %} - {{ course_name }} {{ course_id }} Reported content awaits review + {{ course_name }}: Reported content awaits review {% endblocktrans %} @@ -10,8 +10,9 @@ padding: 1px 1px 1px 15px; margin: 20px 20px 30px 30px; color: rgba(0,0,0,.75);"> - You are receiving this email because the following {{ content_type }} was reported for review - {{ comment_body }} +

You are receiving this email because the following {{ content_type }} was reported for review

+

{{ title }}

+ {{ content_body }} {% trans "Go to Discussion" %}