Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: fix subject email and body html code (#31995)

Browse Source
This commit is contained in:
Attiya Ishaque
2023-03-30 16:00:11 +05:00
committed by GitHub
parent 906744e86b
commit bb9d0b27c0
8 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/djangoapps/instructor/enrollment.py
View File

@@ -50,7 +50,6 @@ from lms.djangoapps.instructor.message_types import (
from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
from openedx.core.djangoapps.user_api.models import UserPreference
from openedx.core.djangolib.markup import Text
from xmodule.modulestore.django import modulestore # lint-amnesty, pylint: disable=wrong-import-order
from xmodule.modulestore.exceptions import ItemNotFoundError # lint-amnesty, pylint: disable=wrong-import-order
@@ -407,7 +406,7 @@ def get_email_params(course, auto_enroll, secure=True, course_key=None, display_
protocol = 'https' if secure else 'http'
course_key = course_key or str(course.id)
display_name = display_name or Text(course.display_name_with_default)
display_name = display_name or course.display_name_with_default
stripped_site_name = configuration_helpers.get_value(
'SITE_NAME',
@@ -492,7 +491,7 @@ def send_mail_to_student(student, param_dict, language=None):
if 'display_name' in param_dict:
param_dict['course_name'] = param_dict['display_name']
elif 'course' in param_dict:
param_dict['course_name'] = Text(param_dict['course'].display_name_with_default)
param_dict['course_name'] = param_dict['course'].display_name_with_default
param_dict['site_name'] = configuration_helpers.get_value(
'SITE_NAME',

5
lms/templates/instructor/edx_ace/accountcreationandenrollment/email/body.html
View File

@@ -7,9 +7,10 @@
<tr>
<td>
<h1>
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}Welcome to {{ course_name }}{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
</h1>
<p style="color: rgba(0,0,0,.75);">

5
lms/templates/instructor/edx_ace/addbetatester/email/body.html
View File

@@ -7,11 +7,12 @@
<tr>
<td>
<h1>
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}
You have been invited to be a beta tester for {{ course_name }} at {{ site_name }}
{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
</h1>
<p style="color: rgba(0,0,0,.75);">

20
lms/templates/instructor/edx_ace/allowedenroll/email/body.html
View File

@@ -7,15 +7,17 @@
<tr>
<td>
<h1>
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}You have been invited to {{ course_name }}{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}You have been invited to join {{ course_name }} at {{ site_name }} by a member of the course staff.{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
<br />
</p>
@@ -52,18 +54,20 @@
<p style="color: rgba(0,0,0,.75);">
{% if auto_enroll %}
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}Once you have registered and activated your account, you will see {{ course_name }} listed on your dashboard.{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
{% elif course_about_url is not None %}
{% filter force_escape %}
{% blocktrans %}Once you have registered and activated your account, you will be able to access this course:{% endblocktrans %}
{% endfilter %}
{% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_name course_cta_url=course_about_url %}
{% else %}
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}You can then enroll in {{ course_name }}.{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
{% endif %}
<br />
</p>

10
lms/templates/instructor/edx_ace/allowedunenroll/email/body.html
View File

@@ -7,15 +7,17 @@
<tr>
<td>
<h1>
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}You have been unenrolled from {{ course_name }}{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}You have been unenrolled from the course {{ course_name }} by a member of the course staff. Please disregard the invitation previously sent.{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
<br />
</p>

10
lms/templates/instructor/edx_ace/enrolledunenroll/email/body.html
View File

@@ -7,17 +7,19 @@
<tr>
<td>
<h1>
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}
You have been unenrolled from {{ course_name }}
{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}You have been unenrolled from {{ course_name }} at {{ site_name }} by a member of the course staff. This course will no longer appear on your {{ site_name }} dashboard.{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
<br />
</p>

10
lms/templates/instructor/edx_ace/enrollenrolled/email/body.html
View File

@@ -7,17 +7,19 @@
<tr>
<td>
<h1>
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}
You have been enrolled in {{ course_name }}
{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}You have been enrolled in {{ course_name }} at {{ site_name }} by a member of the course staff. This course will now appear on your {{ site_name }} dashboard.{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
<br />
</p>

10
lms/templates/instructor/edx_ace/removebetatester/email/body.html
View File

@@ -7,15 +7,17 @@
<tr>
<td>
<h1>
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}You have been removed as a beta tester for {{ course_name }} at {{ site_name }}{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% filter force_escape %}
{% autoescape off %}
{# xss-lint: disable=django-blocktrans-missing-escape-filter #}
{% blocktrans %}You have been removed as a beta tester for {{ course_name }} at {{ site_name }} by a member of the course staff.{% endblocktrans %}
{% endfilter %}
{% endautoescape %}
<br />
</p>