From 9ca5df866650e46206eabb4ea1483ae01d28e475 Mon Sep 17 00:00:00 2001
From: Ali-D-Akbar <aliakbarit019@gmail.com>
Date: Mon, 14 Dec 2020 18:37:30 +0500
Subject: [PATCH] PROD-2123

---
 .../edx_ace/responsenotification/email/body.html      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html
index 71c88ae73f..8eb7c8a303 100644
--- a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html
@@ -1,18 +1,17 @@
 {% extends 'ace_common/edx_ace/common/base_body.html' %}
 
 {% load i18n %}
+{% load django_markup %}
 {% load static %}
 {% block content %}
 <table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
     <tr>
         <td>
             <p>
-                {% filter force_escape %}
                 {% blocktrans trimmed asvar replied_to_text %}
-                    {{ comment_username }} replied to
+                    {{ comment_username }} replied to {start_tag}{{ thread_title }}{end_tag}:
                 {% endblocktrans %}
-                {% endfilter %}
-                {{ replied_to_text }} <b>{{ thread_title }}</b>:
+                {% interpolate_html replied_to_text start_tag='<b>'|safe end_tag='</b>'|safe %}
             </p>
             <div style="border-left: 1px solid rgba(0,0,0,0.25);
                     padding: 1px 1px 1px 15px;
@@ -21,9 +20,7 @@
                 {{ comment_body }}
             </div>
 
-            {% filter force_escape %}
-                {% blocktrans asvar course_cta_text %}View discussion{% endblocktrans %}
-            {% endfilter %}
+            {% trans "View discussion" as course_cta_text %}{{course_cta_text|force_escape}}
             {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=post_link%}
 
             {% block google_analytics_pixel %}