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

Convert instructor email messages to ACE

Browse Source
This commit is contained in:
Omar Al-Ithawi
2018-09-18 09:22:18 +03:00
parent 0a88746aef
commit 6ff3235f84
84 changed files with 864 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
common/test/test_sites/test_site/templates/emails/enroll_email_allowedmessage.txt
View File

@@ -1,30 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear student,")}
${_("You have been invited to join {course_name} at {site_name} by a "
"member of the course staff.").format(
course_name=course.display_name_with_default_escaped,
site_name=site_name
)}
${_("To finish your registration, please visit {registration_url} and fill "
"out the registration form making sure to use {email_address} in the E-mail field.").format(
registration_url=registration_url,
email_address=email_address
)}
% if auto_enroll:
${_("Once you have registered and activated your account, you will see "
"{course_name} listed on your dashboard.").format(
course_name=course.display_name_with_default_escaped
)}
% else:
${_("Once you have registered and activated your account, visit {course_about_url} "
"to join the course.").format(course_about_url=course_about_url)}
% endif
----
${_("This email was automatically sent from {site_name} to "
"{email_address}").format(
site_name=site_name, email_address=email_address
)}

5
common/test/test_sites/test_site/templates/emails/enroll_email_allowedsubject.txt
View File

@@ -1,5 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("You have been invited to register for {course_name}").format(
course_name=course.display_name_with_default_escaped
)}

20
common/test/test_sites/test_site/templates/emails/enroll_email_enrolledmessage.txt
View File

@@ -1,20 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been enrolled in {course_name} at {site_name} by a member "
"of the course staff. The course should now appear on your {site_name} "
"dashboard.").format(
course_name=course.display_name_with_default_escaped,
site_name=site_name
)}
${_("To start accessing course materials, please visit {course_url}").format(
course_url=course_url
)}
----
${_("This email was automatically sent from {site_name} to "
"{full_name}").format(
site_name=site_name, full_name=full_name
)}

5
common/test/test_sites/test_site/templates/emails/enroll_email_enrolledsubject.txt
View File

@@ -1,5 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("You have been enrolled in {course_name}").format(
course_name=course.display_name_with_default_escaped
)}

13
common/test/test_sites/test_site/templates/emails/unenroll_email_allowedmessage.txt
View File

@@ -1,13 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear Student,")}
${_("You have been un-enrolled from course {course_name} by a member "
"of the course staff. Please disregard the invitation "
"previously sent.").format(course_name=course.display_name_with_default_escaped)}
----
${_("This email was automatically sent from {site_name} "
"to {email_address}").format(
site_name=site_name, email_address=email_address
)}

17
common/test/test_sites/test_site/templates/emails/unenroll_email_enrolledmessage.txt
View File

@@ -1,17 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been un-enrolled in {course_name} at {site_name} by a member "
"of the course staff. The course will no longer appear on your "
"{site_name} dashboard.").format(
course_name=course.display_name_with_default_escaped, site_name=site_name
)}
${_("Your other courses have not been affected.")}
----
${_("This email was automatically sent from {site_name} to "
"{full_name}").format(
full_name=full_name, site_name=site_name
)}

5
common/test/test_sites/test_site/templates/emails/unenroll_email_subject.txt
View File

@@ -1,5 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("You have been un-enrolled from {course_name}").format(
course_name=course.display_name_with_default_escaped
)}

3
lms/djangoapps/ccx/tests/utils.py
View File

@@ -8,6 +8,7 @@ from django.conf import settings
from lms.djangoapps.ccx.overrides import override_field_for_ccx
from lms.djangoapps.ccx.tests.factories import CcxFactory
from openedx.core.djangoapps.ace_common.tests.mixins import EmailTemplateTagMixin
from student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole
from student.tests.factories import UserFactory
from xmodule.modulestore.django import modulestore
@@ -15,7 +16,7 @@ from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE,
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
class CcxTestCase(SharedModuleStoreTestCase):
class CcxTestCase(EmailTemplateTagMixin, SharedModuleStoreTestCase):
"""
General test class to be used in other CCX tests classes.

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

@@ -12,18 +12,29 @@ import pytz
from django.conf import settings
from django.contrib.auth.models import User
from django.core.mail import send_mail
from django.template.loader import render_to_string
from django.urls import reverse
from django.utils.translation import override as override_language
from edx_ace import ace
from edx_ace.recipient import Recipient
from six import text_type
from course_modes.models import CourseMode
from courseware.models import StudentModule
from edxmako.shortcuts import render_to_string
from eventtracking import tracker
from lms.djangoapps.grades.constants import ScoreDatabaseTableEnum
from lms.djangoapps.grades.events import STATE_DELETED_EVENT_TYPE
from lms.djangoapps.grades.signals.handlers import disconnect_submissions_signal_receiver
from lms.djangoapps.grades.signals.signals import PROBLEM_RAW_SCORE_CHANGED
from lms.djangoapps.instructor.message_types import (
AccountCreationAndEnrollment,
AddBetaTester,
AllowedEnroll,
AllowedUnenroll,
EnrollEnrolled,
EnrolledUnenroll,
RemoveBetaTester,
)
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
@@ -146,16 +157,17 @@ def enroll_email(course_id, student_email, auto_enroll=False, email_students=Fal
enrollment_obj = CourseEnrollment.enroll_by_email(student_email, course_id, course_mode)
if email_students:
email_params['message'] = 'enrolled_enroll'
email_params['message_type'] = 'enrolled_enroll'
email_params['email_address'] = student_email
email_params['full_name'] = previous_state.full_name
send_mail_to_student(student_email, email_params, language=language)
elif not is_email_retired(student_email):
cea, _ = CourseEnrollmentAllowed.objects.get_or_create(course_id=course_id, email=student_email)
cea.auto_enroll = auto_enroll
cea.save()
if email_students:
email_params['message'] = 'allowed_enroll'
email_params['message_type'] = 'allowed_enroll'
email_params['email_address'] = student_email
send_mail_to_student(student_email, email_params, language=language)
@@ -180,7 +192,7 @@ def unenroll_email(course_id, student_email, email_students=False, email_params=
if previous_state.enrollment:
CourseEnrollment.unenroll_by_email(student_email, course_id)
if email_students:
email_params['message'] = 'enrolled_unenroll'
email_params['message_type'] = 'enrolled_unenroll'
email_params['email_address'] = student_email
email_params['full_name'] = previous_state.full_name
send_mail_to_student(student_email, email_params, language=language)
@@ -188,7 +200,7 @@ def unenroll_email(course_id, student_email, email_students=False, email_params=
if previous_state.allowed:
CourseEnrollmentAllowed.objects.get(course_id=course_id, email=student_email).delete()
if email_students:
email_params['message'] = 'allowed_unenroll'
email_params['message_type'] = 'allowed_unenroll'
email_params['email_address'] = student_email
# Since no User object exists for this student there is no "full_name" available.
send_mail_to_student(student_email, email_params, language=language)
@@ -207,7 +219,7 @@ def send_beta_role_email(action, user, email_params):
`email_params` parameters used while parsing email templates (a `dict`).
"""
if action in ('add', 'remove'):
email_params['message'] = '%s_beta_tester' % action
email_params['message_type'] = '%s_beta_tester' % action
email_params['email_address'] = user.email
email_params['full_name'] = user.profile.name
else:
@@ -422,7 +434,7 @@ def send_mail_to_student(student, param_dict, language=None):
`course_url`: url of course (a `str`)
`email_address`: email of student (a `str`)
`full_name`: student full name (a `str`)
`message`: type of email to send and template to use (a `str`)
`message_type`: type of email to send and template to use (a `str`)
`is_shib_course`: (a `boolean`)
]
@@ -433,71 +445,39 @@ def send_mail_to_student(student, param_dict, language=None):
Returns a boolean indicating whether the email was sent successfully.
"""
# add some helpers and microconfig subsitutions
# Add some helpers and microconfig subsitutions
if 'display_name' in param_dict:
param_dict['course_name'] = param_dict['display_name']
elif 'course' in param_dict:
param_dict['course_name'] = param_dict['course'].display_name_with_default
param_dict['site_name'] = configuration_helpers.get_value(
'SITE_NAME',
param_dict['site_name']
)
subject = None
message = None
# see if there is an activation email template definition available as configuration,
# if so, then render that
message_type = param_dict['message']
message_type = param_dict['message_type']
email_template_dict = {
'allowed_enroll': (
'emails/enroll_email_allowedsubject.txt',
'emails/enroll_email_allowedmessage.txt'
),
'enrolled_enroll': (
'emails/enroll_email_enrolledsubject.txt',
'emails/enroll_email_enrolledmessage.txt'
),
'allowed_unenroll': (
'emails/unenroll_email_subject.txt',
'emails/unenroll_email_allowedmessage.txt'
),
'enrolled_unenroll': (
'emails/unenroll_email_subject.txt',
'emails/unenroll_email_enrolledmessage.txt'
),
'add_beta_tester': (
'emails/add_beta_tester_email_subject.txt',
'emails/add_beta_tester_email_message.txt'
),
'remove_beta_tester': (
'emails/remove_beta_tester_email_subject.txt',
'emails/remove_beta_tester_email_message.txt'
),
'account_creation_and_enrollment': (
'emails/enroll_email_enrolledsubject.txt',
'emails/account_creation_and_enroll_emailMessage.txt'
),
ace_emails_dict = {
'account_creation_and_enrollment': AccountCreationAndEnrollment,
'add_beta_tester': AddBetaTester,
'allowed_enroll': AllowedEnroll,
'allowed_unenroll': AllowedUnenroll,
'enrolled_enroll': EnrollEnrolled,
'enrolled_unenroll': EnrolledUnenroll,
'remove_beta_tester': RemoveBetaTester,
}
subject_template, message_template = email_template_dict.get(message_type, (None, None))
if subject_template is not None and message_template is not None:
subject, message = render_message_to_string(
subject_template, message_template, param_dict, language=language
)
message_class = ace_emails_dict[message_type]
message = message_class().personalize(
recipient=Recipient(username='', email_address=student),
language=language,
user_context=param_dict,
)
if subject and message:
# Remove leading and trailing whitespace from body
message = message.strip()
# Email subject *must not* contain newlines
subject = ''.join(subject.splitlines())
from_address = configuration_helpers.get_value(
'email_from_address',
settings.DEFAULT_FROM_EMAIL
)
send_mail(subject, message, from_address, [student], fail_silently=False)
ace.send(message)
def render_message_to_string(subject_template, message_template, param_dict, language=None):

84
lms/djangoapps/instructor/message_types.py Normal file
View File

@@ -0,0 +1,84 @@
"""
ACE message types for the instructor module.
"""
from openedx.core.djangoapps.ace_common.message import BaseMessageType
class AccountCreationAndEnrollment(BaseMessageType):
"""
A message for registering and inviting learners into a course.
This message includes username and password.
"""
APP_LABEL = 'instructor'
def __init__(self, *args, **kwargs):
super(AccountCreationAndEnrollment, self).__init__(*args, **kwargs)
self.options['transactional'] = True # pylint: disable=unsupported-assignment-operation
class AddBetaTester(BaseMessageType):
"""
A message for course beta testers when they're invited.
"""
APP_LABEL = 'instructor'
def __init__(self, *args, **kwargs):
super(AddBetaTester, self).__init__(*args, **kwargs)
self.options['transactional'] = True # pylint: disable=unsupported-assignment-operation
class AllowedEnroll(BaseMessageType):
"""
A message for _unregistered_ learners who received an invitation to a course.
"""
APP_LABEL = 'instructor'
def __init__(self, *args, **kwargs):
super(AllowedEnroll, self).__init__(*args, **kwargs)
self.options['transactional'] = True # pylint: disable=unsupported-assignment-operation
class AllowedUnenroll(BaseMessageType):
"""
A message for _unregistered_ learners who had their invitation to a course cancelled.
"""
APP_LABEL = 'instructor'
def __init__(self, *args, **kwargs):
super(AllowedUnenroll, self).__init__(*args, **kwargs)
self.options['transactional'] = True # pylint: disable=unsupported-assignment-operation
class EnrollEnrolled(BaseMessageType):
"""
A message for _registered_ learners who have been both invited and enrolled to a course.
"""
APP_LABEL = 'instructor'
def __init__(self, *args, **kwargs):
super(EnrollEnrolled, self).__init__(*args, **kwargs)
self.options['transactional'] = True # pylint: disable=unsupported-assignment-operation
class EnrolledUnenroll(BaseMessageType):
"""
A message for _registered_ learners who have been unenrolled from a course.
"""
APP_LABEL = 'instructor'
def __init__(self, *args, **kwargs):
super(EnrolledUnenroll, self).__init__(*args, **kwargs)
self.options['transactional'] = True # pylint: disable=unsupported-assignment-operation
class RemoveBetaTester(BaseMessageType):
"""
A message for course beta testers when they're removed.
"""
APP_LABEL = 'instructor'
def __init__(self, *args, **kwargs):
super(RemoveBetaTester, self).__init__(*args, **kwargs)
self.options['transactional'] = True # pylint: disable=unsupported-assignment-operation

3
lms/djangoapps/instructor/tests/test_access.py
View File

@@ -7,6 +7,7 @@ import pytest
from django_comment_common.models import FORUM_ROLE_MODERATOR, Role
from lms.djangoapps.instructor.access import allow_access, list_with_level, revoke_access, update_forum_role
from openedx.core.lib.tests import attr
from openedx.core.djangoapps.ace_common.tests.mixins import EmailTemplateTagMixin
from student.roles import CourseBetaTesterRole, CourseCcxCoachRole, CourseStaffRole
from student.tests.factories import UserFactory
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
@@ -40,7 +41,7 @@ class TestInstructorAccessList(SharedModuleStoreTestCase):
@attr(shard=1)
class TestInstructorAccessAllow(SharedModuleStoreTestCase):
class TestInstructorAccessAllow(EmailTemplateTagMixin, SharedModuleStoreTestCase):
""" Test access allow. """
@classmethod
def setUpClass(cls):

380
lms/djangoapps/instructor/tests/test_api.py
View File

@@ -1304,18 +1304,26 @@ class TestInstructorAPIEnrollment(SharedModuleStoreTestCase, LoginEnrollmentTest
mail.outbox[0].subject,
u'You have been enrolled in {}'.format(self.course.display_name)
)
self.assertEqual(
mail.outbox[0].body,
"Dear NotEnrolled Student\n\nYou have been enrolled in {} "
"at edx.org by a member of the course staff. "
"The course should now appear on your edx.org dashboard.\n\n"
"To start accessing course materials, please visit "
"{proto}://{site}{course_path}\n\n----\n"
"This email was automatically sent from edx.org to NotEnrolled Student".format(
self.course.display_name,
proto=protocol, site=self.site_name, course_path=self.course_path
)
)
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
assert text_body.startswith('Dear NotEnrolled Student\n\n')
for body in [text_body, html_body]:
self.assertIn('You have been enrolled in {course_name} at edx.org by a member of the course staff.'.format(
course_name=self.course.display_name,
), body)
self.assertIn('This course will now appear on your edx.org dashboard.', body)
self.assertIn('{proto}://{site}{course_path}'.format(
proto=protocol,
site=self.site_name,
course_path=self.course_path,
), body)
self.assertIn("To start accessing course materials, please visit", text_body)
self.assertIn("This email was automatically sent from edx.org to NotEnrolled Student\n\n", text_body)
@ddt.data('http', 'https')
def test_enroll_with_email_not_registered(self, protocol):
@@ -1334,17 +1342,35 @@ class TestInstructorAPIEnrollment(SharedModuleStoreTestCase, LoginEnrollmentTest
mail.outbox[0].subject,
u'You have been invited to register for {}'.format(self.course.display_name)
)
self.assertEqual(
mail.outbox[0].body,
"Dear student,\n\nYou have been invited to join {} at edx.org by a member of the course staff.\n\n"
"To finish your registration, please visit {proto}://{site}/register and fill out the "
"registration form making sure to use robot-not-an-email-yet@robot.org in the E-mail field.\n"
"Once you have registered and activated your account, "
"visit {proto}://{site}{about_path} to join the course.\n\n----\n"
"This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org".format(
self.course.display_name, proto=protocol, site=self.site_name, about_path=self.about_path
)
)
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
register_url = '{proto}://{site}/register'.format(proto=protocol, site=self.site_name)
assert text_body.startswith('Dear student,')
assert 'To finish your registration, please visit {register_url}'.format(
register_url=register_url,
) in text_body
assert 'Please finish your registration and fill out' in html_body
assert register_url in html_body
for body in [text_body, html_body]:
assert 'You have been invited to join {course} at edx.org by a member of the course staff.'.format(
course=self.course.display_name
) in body
assert ('fill out the registration form making sure to use '
'robot-not-an-email-yet@robot.org in the Email field') in body
assert 'Once you have registered and activated your account,' in body
assert '{proto}://{site}{about_path}'.format(
proto=protocol,
site=self.site_name,
about_path=self.about_path
) in body
assert 'This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org' in body
@ddt.data('http', 'https')
@patch.dict(settings.FEATURES, {'ENABLE_MKTG_SITE': True})
@@ -1358,17 +1384,32 @@ class TestInstructorAPIEnrollment(SharedModuleStoreTestCase, LoginEnrollmentTest
self.assertEqual(manual_enrollments.count(), 1)
self.assertEqual(manual_enrollments[0].state_transition, UNENROLLED_TO_ALLOWEDTOENROLL)
self.assertEqual(response.status_code, 200)
self.assertEqual(
mail.outbox[0].body,
"Dear student,\n\nYou have been invited to join {display_name}"
" at edx.org by a member of the course staff.\n\n"
"To finish your registration, please visit {proto}://{site}/register and fill out the registration form "
"making sure to use robot-not-an-email-yet@robot.org in the E-mail field.\n"
"You can then enroll in {display_name}.\n\n----\n"
"This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org".format(
display_name=self.course.display_name, proto=protocol, site=self.site_name
)
)
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
assert text_body.startswith('Dear student,')
assert 'To finish your registration, please visit' in text_body
assert 'Please finish your registration and fill' in html_body
for body in [text_body, html_body]:
assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format(
display_name=self.course.display_name
) in body
assert '{proto}://{site}/register'.format(
proto=protocol,
site=self.site_name
) in body
assert ('fill out the registration form making sure to use '
'robot-not-an-email-yet@robot.org in the Email field') in body
assert 'You can then enroll in {display_name}.'.format(
display_name=self.course.display_name
) in body
assert 'This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org' in body
@ddt.data('http', 'https')
def test_enroll_with_email_not_registered_autoenroll(self, protocol):
@@ -1389,19 +1430,38 @@ class TestInstructorAPIEnrollment(SharedModuleStoreTestCase, LoginEnrollmentTest
manual_enrollments = ManualEnrollmentAudit.objects.all()
self.assertEqual(manual_enrollments.count(), 1)
self.assertEqual(manual_enrollments[0].state_transition, UNENROLLED_TO_ALLOWEDTOENROLL)
self.assertEqual(
mail.outbox[0].body,
"Dear student,\n\nYou have been invited to join {display_name}"
" at edx.org by a member of the course staff.\n\n"
"To finish your registration, please visit {proto}://{site}/register and fill out the registration form "
"making sure to use robot-not-an-email-yet@robot.org in the E-mail field.\n"
"Once you have registered and activated your account,"
" you will see {display_name} listed on your dashboard.\n\n----\n"
"This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org".format(
proto=protocol, site=self.site_name, display_name=self.course.display_name
)
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
register_url = '{proto}://{site}/register'.format(
proto=protocol,
site=self.site_name,
)
assert text_body.startswith('Dear student,')
assert 'To finish your registration, please visit {register_url}'.format(
register_url=register_url,
) in text_body
assert 'Please finish your registration and fill out the registration' in html_body
assert 'Finish Your Registration' in html_body
assert register_url in html_body
for body in [text_body, html_body]:
assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format(
display_name=self.course.display_name
) in body
assert (' and fill '
'out the registration form making sure to use robot-not-an-email-yet@robot.org '
'in the Email field') in body
assert ('Once you have registered and activated your account, '
'you will see {display_name} listed on your dashboard.').format(
display_name=self.course.display_name
) in body
assert 'This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org' in body
def test_unenroll_without_email(self):
url = reverse('students_update_enrollment', kwargs={'course_id': text_type(self.course.id)})
response = self.client.post(url, {'identifiers': self.enrolled_student.email, 'action': 'unenroll',
@@ -1489,18 +1549,22 @@ class TestInstructorAPIEnrollment(SharedModuleStoreTestCase, LoginEnrollmentTest
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(
mail.outbox[0].subject,
'You have been un-enrolled from {display_name}'.format(display_name=self.course.display_name,)
'You have been unenrolled from {display_name}'.format(display_name=self.course.display_name,)
)
self.assertEqual(
mail.outbox[0].body,
"Dear Enrolled Student\n\nYou have been un-enrolled in {display_name} "
"at edx.org by a member of the course staff. "
"The course will no longer appear on your edx.org dashboard.\n\n"
"Your other courses have not been affected.\n\n----\n"
"This email was automatically sent from edx.org to Enrolled Student".format(
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
assert text_body.startswith('Dear Enrolled Student')
for body in [text_body, html_body]:
assert 'You have been unenrolled from {display_name} at edx.org by a member of the course staff.'.format(
display_name=self.course.display_name,
)
)
) in body
assert 'This course will no longer appear on your edx.org dashboard.' in body
assert 'Your other courses have not been affected.' in body
assert 'This email was automatically sent from edx.org to Enrolled Student' in body
def test_unenroll_with_email_allowed_student(self):
url = reverse('students_update_enrollment', kwargs={'course_id': text_type(self.course.id)})
@@ -1542,16 +1606,20 @@ class TestInstructorAPIEnrollment(SharedModuleStoreTestCase, LoginEnrollmentTest
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(
mail.outbox[0].subject,
'You have been un-enrolled from {display_name}'.format(display_name=self.course.display_name,)
'You have been unenrolled from {display_name}'.format(display_name=self.course.display_name,)
)
self.assertEqual(
mail.outbox[0].body,
"Dear Student,\n\nYou have been un-enrolled from course {display_name} by a member of the course staff. "
"Please disregard the invitation previously sent.\n\n----\n"
"This email was automatically sent from edx.org to robot-allowed@robot.org".format(
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
assert text_body.startswith('Dear Student,')
for body in [text_body, html_body]:
assert 'You have been unenrolled from the course {display_name} by a member of the course staff.'.format(
display_name=self.course.display_name,
)
)
) in body
assert 'Please disregard the invitation previously sent.' in body
assert 'This email was automatically sent from edx.org to robot-allowed@robot.org' in body
@ddt.data('http', 'https')
@patch('lms.djangoapps.instructor.enrollment.uses_shib')
@@ -1571,15 +1639,26 @@ class TestInstructorAPIEnrollment(SharedModuleStoreTestCase, LoginEnrollmentTest
'You have been invited to register for {display_name}'.format(display_name=self.course.display_name,)
)
self.assertEqual(
mail.outbox[0].body,
"Dear student,\n\nYou have been invited to join {display_name} at edx.org by a member of the course staff.\n\n"
"To access the course visit {proto}://{site}{about_path} and register for the course.\n\n----\n"
"This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org".format(
proto=protocol, site=self.site_name, about_path=self.about_path,
display_name=self.course.display_name,
)
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
course_url = '{proto}://{site}{about_path}'.format(
proto=protocol,
site=self.site_name,
about_path=self.about_path,
)
assert text_body.startswith('Dear student,')
assert 'To access this course visit {course_url} and register for this course.'.format(
course_url=course_url,
) in text_body
assert 'To access this course visit it and register:' in html_body
assert course_url in html_body
for body in [text_body, html_body]:
assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format(
display_name=self.course.display_name,
) in body
assert 'This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org' in body
@patch('lms.djangoapps.instructor.enrollment.uses_shib')
@patch.dict(settings.FEATURES, {'ENABLE_MKTG_SITE': True})
@@ -1594,13 +1673,17 @@ class TestInstructorAPIEnrollment(SharedModuleStoreTestCase, LoginEnrollmentTest
'email_students': True})
self.assertEqual(response.status_code, 200)
self.assertEqual(
mail.outbox[0].body,
"Dear student,\n\nYou have been invited to join {} at edx.org by a member of the course staff.\n\n----\n"
"This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org".format(
self.course.display_name,
)
)
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
assert text_body.startswith('Dear student,')
for body in [text_body, html_body]:
assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format(
display_name=self.course.display_name,
) in body
assert 'This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org' in body
@ddt.data('http', 'https')
@patch('lms.djangoapps.instructor.enrollment.uses_shib')
@@ -1622,17 +1705,24 @@ class TestInstructorAPIEnrollment(SharedModuleStoreTestCase, LoginEnrollmentTest
'You have been invited to register for {display_name}'.format(display_name=self.course.display_name,)
)
self.assertEqual(
mail.outbox[0].body,
"Dear student,\n\nYou have been invited to join {display_name}"
" at edx.org by a member of the course staff.\n\n"
"To access the course visit {proto}://{site}{course_path} and login.\n\n----\n"
"This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org".format(
display_name=self.course.display_name,
proto=protocol, site=self.site_name, course_path=self.course_path
)
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
course_url = '{proto}://{site}{course_path}'.format(
proto=protocol, site=self.site_name, course_path=self.course_path,
)
assert text_body.startswith('Dear student,')
assert course_url in html_body
assert 'To access this course visit {course_url} and login.'.format(course_url=course_url) in text_body
assert 'To access this course click on the button below and login:' in html_body
for body in [text_body, html_body]:
assert 'You have been invited to join {display_name} at edx.org by a member of the course staff.'.format(
display_name=self.course.display_name,
) in body
assert 'This email was automatically sent from edx.org to robot-not-an-email-yet@robot.org' in body
def test_enroll_already_enrolled_student(self):
"""
Ensure that already enrolled "verified" students cannot be downgraded
@@ -1965,21 +2055,29 @@ class TestInstructorAPIBulkBetaEnrollment(SharedModuleStoreTestCase, LoginEnroll
'You have been invited to a beta test for {display_name}'.format(display_name=self.course.display_name,)
)
self.assertEqual(
mail.outbox[0].body,
u"Dear {student_name}\n\nYou have been invited to be a beta tester "
"for {display_name} at edx.org by a member of the course staff.\n\n"
"Visit {proto}://{site}{about_path} to join "
"the course and begin the beta test.\n\n----\n"
"This email was automatically sent from edx.org to {student_email}".format(
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
student_name = self.notenrolled_student.profile.name
assert text_body.startswith('Dear {student_name}'.format(student_name=student_name))
assert 'Visit {display_name}'.format(display_name=self.course.display_name) in html_body
for body in [text_body, html_body]:
assert 'You have been invited to be a beta tester for {display_name} at edx.org'.format(
display_name=self.course.display_name,
student_name=self.notenrolled_student.profile.name,
student_email=self.notenrolled_student.email,
) in body
assert 'by a member of the course staff.' in body
assert 'enroll in this course and begin the beta test' in body
assert '{proto}://{site}{about_path}'.format(
proto=protocol,
site=self.site_name,
about_path=self.about_path
)
)
about_path=self.about_path,
) in body
assert 'This email was automatically sent from edx.org to {student_email}'.format(
student_email=self.notenrolled_student.email,
) in body
@ddt.data('http', 'https')
def test_add_notenrolled_with_email_autoenroll(self, protocol):
@@ -2013,21 +2111,28 @@ class TestInstructorAPIBulkBetaEnrollment(SharedModuleStoreTestCase, LoginEnroll
'You have been invited to a beta test for {display_name}'.format(display_name=self.course.display_name)
)
self.assertEqual(
mail.outbox[0].body,
u"Dear {student_name}\n\nYou have been invited to be a beta tester "
"for {display_name} at edx.org by a member of the course staff.\n\n"
"To start accessing course materials, please visit "
"{proto}://{site}{course_path}\n\n----\n"
"This email was automatically sent from edx.org to {student_email}".format(
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
student_name = self.notenrolled_student.profile.name
assert text_body.startswith('Dear {student_name}'.format(student_name=student_name))
for body in [text_body, html_body]:
assert 'You have been invited to be a beta tester for {display_name} at edx.org'.format(
display_name=self.course.display_name,
student_name=self.notenrolled_student.profile.name,
student_email=self.notenrolled_student.email,
) in body
assert 'by a member of the course staff' in body
assert 'To start accessing course materials, please visit' in body
assert '{proto}://{site}{course_path}'.format(
proto=protocol,
site=self.site_name,
course_path=self.course_path
)
)
assert 'This email was automatically sent from edx.org to {student_email}'.format(
student_email=self.notenrolled_student.email,
) in body
@patch.dict(settings.FEATURES, {'ENABLE_MKTG_SITE': True})
def test_add_notenrolled_email_mktgsite(self):
@@ -2036,17 +2141,23 @@ class TestInstructorAPIBulkBetaEnrollment(SharedModuleStoreTestCase, LoginEnroll
response = self.client.post(url, {'identifiers': self.notenrolled_student.email, 'action': 'add', 'email_students': True})
self.assertEqual(response.status_code, 200)
self.assertEqual(
mail.outbox[0].body,
u"Dear {}\n\nYou have been invited to be a beta tester "
"for {} at edx.org by a member of the course staff.\n\n"
"Visit edx.org to enroll in the course and begin the beta test.\n\n----\n"
"This email was automatically sent from edx.org to {}".format(
self.notenrolled_student.profile.name,
self.course.display_name,
self.notenrolled_student.email,
)
)
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
student_name = self.notenrolled_student.profile.name
assert text_body.startswith('Dear {student_name}'.format(student_name=student_name))
for body in [text_body, html_body]:
assert 'You have been invited to be a beta tester for {display_name} at edx.org'.format(
display_name=self.course.display_name,
) in body
assert 'by a member of the course staff.' in body
assert 'Visit edx.org' in body
assert 'enroll in this course and begin the beta test' in body
assert 'This email was automatically sent from edx.org to {student_email}'.format(
student_email=self.notenrolled_student.email,
) in body
def test_enroll_with_email_not_registered(self):
# User doesn't exist
@@ -2137,19 +2248,24 @@ class TestInstructorAPIBulkBetaEnrollment(SharedModuleStoreTestCase, LoginEnroll
mail.outbox[0].subject,
u'You have been removed from a beta test for {display_name}'.format(display_name=self.course.display_name,)
)
self.assertEqual(
mail.outbox[0].body,
"Dear {full_name}\n\nYou have been removed as a beta tester for "
"{display_name} at edx.org by a member of the course staff. "
"The course will remain on your dashboard, but you will no longer "
"be part of the beta testing group.\n\n"
"Your other courses have not been affected.\n\n----\n"
"This email was automatically sent from edx.org to {email_address}".format(
text_body = mail.outbox[0].body
html_body = mail.outbox[0].alternatives[0][0]
assert text_body.startswith('Dear {name}'.format(name=self.beta_tester.profile.name))
for body in [text_body, html_body]:
assert 'You have been removed as a beta tester for {display_name} at edx.org'.format(
display_name=self.course.display_name,
full_name=self.beta_tester.profile.name,
email_address=self.beta_tester.email
)
)
) in body
assert ('This course will remain on your dashboard, but you will no longer be '
'part of the beta testing group.') in body
assert 'Your other courses have not been affected.' in body
assert 'This email was automatically sent from edx.org to {email_address}'.format(
email_address=self.beta_tester.email,
) in body
@attr(shard=5)

24
lms/djangoapps/instructor/tests/test_api_email_localization.py
View File

@@ -33,14 +33,14 @@ class TestInstructorAPIEnrollmentEmailLocalization(SharedModuleStoreTestCase):
super(TestInstructorAPIEnrollmentEmailLocalization, self).setUp()
# Platform language is English, instructor's language is Chinese,
# student's language is French, so the emails should all be sent in
# French.
# student's language is Esperanto, so the emails should all be sent in
# Esperanto.
self.instructor = InstructorFactory(course_key=self.course.id)
set_user_preference(self.instructor, LANGUAGE_KEY, 'zh-cn')
self.client.login(username=self.instructor.username, password='test')
self.student = UserFactory.create()
set_user_preference(self.student, LANGUAGE_KEY, 'fr')
set_user_preference(self.student, LANGUAGE_KEY, 'eo')
def update_enrollement(self, action, student_email):
"""
@@ -51,12 +51,12 @@ class TestInstructorAPIEnrollmentEmailLocalization(SharedModuleStoreTestCase):
response = self.client.post(url, args)
return response
def check_outbox_is_french(self):
def check_outbox_is_esperanto(self):
"""
Check that the email outbox contains exactly one message for which both
the message subject and body contain a certain French string.
the message subject and body contain a certain Esperanto string.
"""
return self.check_outbox(u"Vous avez été")
return self.check_outbox(u"Ýöü hävé ßéén")
def check_outbox(self, expected_message):
"""
@@ -70,7 +70,7 @@ class TestInstructorAPIEnrollmentEmailLocalization(SharedModuleStoreTestCase):
def test_enroll(self):
self.update_enrollement("enroll", self.student.email)
self.check_outbox_is_french()
self.check_outbox_is_esperanto()
def test_unenroll(self):
CourseEnrollment.enroll(
@@ -79,22 +79,22 @@ class TestInstructorAPIEnrollmentEmailLocalization(SharedModuleStoreTestCase):
)
self.update_enrollement("unenroll", self.student.email)
self.check_outbox_is_french()
self.check_outbox_is_esperanto()
def test_set_beta_role(self):
url = reverse('bulk_beta_modify_access', kwargs={'course_id': text_type(self.course.id)})
self.client.post(url, {'identifiers': self.student.email, 'action': 'add', 'email_students': 'true'})
self.check_outbox_is_french()
self.check_outbox_is_esperanto()
def test_enroll_unsubscribed_student(self):
# Student is unknown, so the platform language should be used
self.update_enrollement("enroll", "newuser@hotmail.com")
self.check_outbox("You have been")
@override_settings(LANGUAGE_CODE="fr")
def test_user_without_preference_receives_email_in_french(self):
@override_settings(LANGUAGE_CODE="eo")
def test_user_without_preference_receives_email_in_esperanto(self):
delete_user_preference(self.student, LANGUAGE_KEY)
self.update_enrollement("enroll", self.student.email)
self.check_outbox_is_french()
self.check_outbox_is_esperanto()

65
lms/djangoapps/instructor/tests/test_enrollment.py
View File

@@ -6,6 +6,7 @@ Unit tests for instructor.enrollment methods.
import json
from abc import ABCMeta
import ddt
import mock
from ccx_keys.locator import CCXLocator
from django.conf import settings
@@ -31,6 +32,7 @@ from lms.djangoapps.instructor.enrollment import (
send_beta_role_email,
unenroll_email
)
from openedx.core.djangoapps.ace_common.tests.mixins import EmailTemplateTagMixin
from openedx.core.djangolib.testing.utils import CacheIsolationTestCase, get_mock_request
from openedx.core.lib.tests import attr
from student.models import CourseEnrollment, CourseEnrollmentAllowed, anonymous_id_for_user
@@ -762,7 +764,8 @@ class TestGetEmailParams(SharedModuleStoreTestCase):
@attr(shard=1)
class TestRenderMessageToString(SharedModuleStoreTestCase):
@ddt.ddt
class TestRenderMessageToString(EmailTemplateTagMixin, SharedModuleStoreTestCase):
"""
Test that email templates can be rendered in a language chosen manually.
Test CCX enrollmet email.
@@ -773,8 +776,8 @@ class TestRenderMessageToString(SharedModuleStoreTestCase):
def setUpClass(cls):
super(TestRenderMessageToString, cls).setUpClass()
cls.course = CourseFactory.create()
cls.subject_template = 'emails/enroll_email_allowedsubject.txt'
cls.message_template = 'emails/enroll_email_allowedmessage.txt'
cls.subject_template = 'instructor/edx_ace/allowedenroll/email/subject.txt'
cls.message_template = 'instructor/edx_ace/allowedenroll/email/body.txt'
@patch.dict('django.conf.settings.FEATURES', {'CUSTOM_COURSES_EDX': True})
def setUp(self):
@@ -792,6 +795,7 @@ class TestRenderMessageToString(SharedModuleStoreTestCase):
email_params = get_email_params(self.course, True)
email_params["email_address"] = "user@example.com"
email_params["full_name"] = "Jean Reno"
email_params["course_name"] = email_params["display_name"]
return email_params
@@ -807,6 +811,8 @@ class TestRenderMessageToString(SharedModuleStoreTestCase):
)
email_params["email_address"] = "user@example.com"
email_params["full_name"] = "Jean Reno"
email_params["course_name"] = email_params["display_name"]
email_params.update(self.context)
return email_params
@@ -832,12 +838,12 @@ class TestRenderMessageToString(SharedModuleStoreTestCase):
)
def test_subject_and_message_translation(self):
subject, message = self.get_subject_and_message('fr')
subject, message = self.get_subject_and_message('eo')
language_after_rendering = get_language()
you_have_been_invited_in_french = u"Vous avez été invité"
self.assertIn(you_have_been_invited_in_french, subject)
self.assertIn(you_have_been_invited_in_french, message)
you_have_been_invited_in_esperanto = u"Ýöü hävé ßéén"
self.assertIn(you_have_been_invited_in_esperanto, subject)
self.assertIn(you_have_been_invited_in_esperanto, message)
self.assertEqual(settings.LANGUAGE_CODE, language_after_rendering)
def test_platform_language_is_used_for_logged_in_user(self):
@@ -847,15 +853,19 @@ class TestRenderMessageToString(SharedModuleStoreTestCase):
self.assertIn("You have been", message)
@patch.dict('django.conf.settings.FEATURES', {'CUSTOM_COURSES_EDX': True})
def test_render_enrollment_message_ccx_members(self):
@ddt.data('body.txt', 'body.html')
def test_render_enrollment_message_ccx_members(self, body_file_name):
"""
Test enrollment email template renders for CCX.
For EDX members.
"""
subject_template = 'emails/enroll_email_enrolledsubject.txt'
message_template = 'emails/enroll_email_enrolledmessage.txt'
subject_template = 'instructor/edx_ace/enrollenrolled/email/subject.txt'
body_template = 'instructor/edx_ace/enrollenrolled/email/{body_file_name}'.format(
body_file_name=body_file_name,
)
subject, message = self.get_subject_and_message_ccx(subject_template, body_template)
subject, message = self.get_subject_and_message_ccx(subject_template, message_template)
self.assertIn(self.ccx.display_name, subject)
self.assertIn(self.ccx.display_name, message)
site = settings.SITE_NAME
@@ -866,28 +876,34 @@ class TestRenderMessageToString(SharedModuleStoreTestCase):
self.assertIn(course_url, message)
@patch.dict('django.conf.settings.FEATURES', {'CUSTOM_COURSES_EDX': True})
def test_render_unenrollment_message_ccx_members(self):
@ddt.data('body.txt', 'body.html')
def test_render_unenrollment_message_ccx_members(self, body_file_name):
"""
Test unenrollment email template renders for CCX.
For EDX members.
"""
subject_template = 'emails/unenroll_email_subject.txt'
message_template = 'emails/unenroll_email_enrolledmessage.txt'
subject_template = 'instructor/edx_ace/enrolledunenroll/email/subject.txt'
body_template = 'instructor/edx_ace/enrolledunenroll/email/{body_file_name}'.format(
body_file_name=body_file_name,
)
subject, message = self.get_subject_and_message_ccx(subject_template, message_template)
subject, message = self.get_subject_and_message_ccx(subject_template, body_template)
self.assertIn(self.ccx.display_name, subject)
self.assertIn(self.ccx.display_name, message)
@patch.dict('django.conf.settings.FEATURES', {'CUSTOM_COURSES_EDX': True})
def test_render_enrollment_message_ccx_non_members(self):
@ddt.data('body.txt', 'body.html')
def test_render_enrollment_message_ccx_non_members(self, body_file_name):
"""
Test enrollment email template renders for CCX.
For non EDX members.
"""
subject_template = 'emails/enroll_email_allowedsubject.txt'
message_template = 'emails/enroll_email_allowedmessage.txt'
subject_template = 'instructor/edx_ace/allowedenroll/email/subject.txt'
body_template = 'instructor/edx_ace/allowedenroll/email/{body_file_name}'.format(
body_file_name=body_file_name,
)
subject, message = self.get_subject_and_message_ccx(subject_template, message_template)
subject, message = self.get_subject_and_message_ccx(subject_template, body_template)
self.assertIn(self.ccx.display_name, subject)
self.assertIn(self.ccx.display_name, message)
site = settings.SITE_NAME
@@ -895,14 +911,17 @@ class TestRenderMessageToString(SharedModuleStoreTestCase):
self.assertIn(registration_url, message)
@patch.dict('django.conf.settings.FEATURES', {'CUSTOM_COURSES_EDX': True})
def test_render_unenrollment_message_ccx_non_members(self):
@ddt.data('body.txt', 'body.html')
def test_render_unenrollment_message_ccx_non_members(self, body_file_name):
"""
Test unenrollment email template renders for CCX.
For non EDX members.
"""
subject_template = 'emails/unenroll_email_subject.txt'
message_template = 'emails/unenroll_email_allowedmessage.txt'
subject_template = 'instructor/edx_ace/allowedunenroll/email/subject.txt'
body_template = 'instructor/edx_ace/allowedunenroll/email/{body_file_name}'.format(
body_file_name=body_file_name,
)
subject, message = self.get_subject_and_message_ccx(subject_template, message_template)
subject, message = self.get_subject_and_message_ccx(subject_template, body_template)
self.assertIn(self.ccx.display_name, subject)
self.assertIn(self.ccx.display_name, message)

2
lms/djangoapps/instructor/views/api.py
View File

@@ -574,7 +574,7 @@ def create_and_enroll_user(email, username, name, country, password, course_id,
try:
# It's a new user, an email will be sent to each newly created user.
email_params.update({
'message': 'account_creation_and_enrollment',
'message_type': 'account_creation_and_enrollment',
'email_address': email,
'password': password,
'platform_name': configuration_helpers.get_value('platform_name', settings.PLATFORM_NAME),

2
lms/djangoapps/instructor/views/registration_codes.py
View File

@@ -118,7 +118,7 @@ def delete_redemption_entry(request, code_redemption, course_key):
course = get_course_by_id(course_key, depth=0)
email_params = get_email_params(course, True, secure=request.is_secure())
email_params['message'] = 'enrolled_unenroll'
email_params['message_type'] = 'enrolled_unenroll'
email_params['email_address'] = email_address
email_params['full_name'] = full_name
send_mail_to_student(email_address, email_params)

43
lms/templates/ccx/enroll_email_allowedmessage.txt
View File

@@ -1,43 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear student,")}
${_("You have been invited to join {course_name} at {site_name} by a "
"member of the course staff.").format(
course_name=course.display_name,
site_name=site_name
)}
% if is_shib_course:
% if auto_enroll:
${_("To access the course visit {course_url} and login.").format(course_url=course_url)}
% elif course_about_url is not None:
${_("To access the course visit {course_about_url} and register for the course.").format(
course_about_url=course_about_url)}
% endif
% else:
${_("To finish your registration, please visit {registration_url} and fill "
"out the registration form making sure to use {email_address} in the E-mail field.").format(
registration_url=registration_url,
email_address=email_address
)}
% if auto_enroll:
${_("Once you have registered and activated your account, you will see "
"{course_name} listed on your dashboard.").format(
course_name=course.display_name
)}
% elif course_about_url is not None:
${_("Once you have registered and activated your account, visit {course_about_url} "
"to join the course.").format(course_about_url=course_about_url)}
% else:
${_("You can then enroll in {course_name}.").format(course_name=course.display_name)}
% endif
% endif
----
${_("This email was automatically sent from {site_name} to "
"{email_address}").format(
site_name=site_name, email_address=email_address
)}

5
lms/templates/ccx/enroll_email_allowedsubject.txt
View File

@@ -1,5 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("You have been invited to register for {course_name}").format(
course_name=course.display_name
)}

20
lms/templates/ccx/enroll_email_enrolledmessage.txt
View File

@@ -1,20 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been enrolled in {course_name} at {site_name} by a member "
"of the course staff. The course should now appear on your {site_name} "
"dashboard.").format(
course_name=course.display_name,
site_name=site_name
)}
${_("To start accessing course materials, please visit {course_url}").format(
course_url=course_url
)}
----
${_("This email was automatically sent from {site_name} to "
"{full_name}").format(
site_name=site_name, full_name=full_name
)}

5
lms/templates/ccx/enroll_email_enrolledsubject.txt
View File

@@ -1,5 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("You have been enrolled in {course_name}").format(
course_name=course.display_name
)}

13
lms/templates/ccx/unenroll_email_allowedmessage.txt
View File

@@ -1,13 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear Student,")}
${_("You have been un-enrolled from course {course_name} by a member "
"of the course staff. Please disregard the invitation "
"previously sent.").format(course_name=course.display_name)}
----
${_("This email was automatically sent from {site_name} "
"to {email_address}").format(
site_name=site_name, email_address=email_address
)}

17
lms/templates/ccx/unenroll_email_enrolledmessage.txt
View File

@@ -1,17 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been un-enrolled in {course_name} at {site_name} by a member "
"of the course staff. The course will no longer appear on your "
"{site_name} dashboard.").format(
course_name=course.display_name, site_name=site_name
)}
${_("Your other courses have not been affected.")}
----
${_("This email was automatically sent from {site_name} to "
"{full_name}").format(
full_name=full_name, site_name=site_name
)}

5
lms/templates/ccx/unenroll_email_subject.txt
View File

@@ -1,5 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("You have been un-enrolled from {course_name}").format(
course_name=course.display_name
)}

14
lms/templates/emails/account_creation_and_enroll_emailMessage.txt
View File

@@ -1,14 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Welcome to {course_name}").format(course_name=course.display_name_with_default_escaped)}
${_("To get started, please visit https://{site_name}. The login information for your account follows.").format(site_name=site_name)}
${_("email: {email}").format(email=email_address)}
${_("password: {password}").format(password=password)}
${_("It is recommended that you change your password.")}
${_("Sincerely yours,"
""
"The {course_name} Team").format(course_name=course.display_name_with_default_escaped)}

1
lms/templates/emails/activation_email.txt
View File

@@ -1,3 +1,4 @@
## mako
<%! from django.utils.translation import ugettext as _ %>
${_("You're almost there! Use the link to activate your account to access engaging, high-quality "
"{platform_name} courses. Note that you will not be able to log back into your account until "

1
lms/templates/emails/activation_email_subject.txt
View File

@@ -1,2 +1,3 @@
## mako
<%! from django.utils.translation import ugettext as _ %>
${_("Action Required: Activate your {platform_name} account").format(platform_name=platform_name)}

25
lms/templates/emails/add_beta_tester_email_message.txt
View File

@@ -1,25 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been invited to be a beta tester for {course_name} at {site_name} by a "
"member of the course staff.").format(
course_name=course.display_name_with_default_escaped,
site_name=site_name
)}
% if auto_enroll:
${_("To start accessing course materials, please visit {course_url}").format(
course_url=course_url
)}
% elif course_about_url is not None:
${_("Visit {course_about_url} to join the course and begin the beta test.").format(course_about_url=course_about_url)}
% else:
${_("Visit {site_name} to enroll in the course and begin the beta test.").format(site_name=site_name)}
% endif
----
${_("This email was automatically sent from {site_name} to "
"{email_address}").format(
site_name=site_name, email_address=email_address
)}

5
lms/templates/emails/add_beta_tester_email_subject.txt
View File

@@ -1,5 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("You have been invited to a beta test for {course_name}").format(
course_name=course.display_name_with_default_escaped
)}

1
lms/templates/emails/business_order_confirmation_email.txt
View File

@@ -1,3 +1,4 @@
## mako
<%! from django.utils.translation import ugettext as _ %>
<p>
${_("Hi {name},").format(name=recipient_name)}

1
lms/templates/emails/confirm_email_change.txt
View File

@@ -1,3 +1,4 @@
## mako
<%! from django.urls import reverse %>
<%! from django.utils.translation import ugettext as _ %>
<%! from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers %>

1
lms/templates/emails/email_change.txt
View File

@@ -1,3 +1,4 @@
## mako
<%! from django.utils.translation import ugettext as _ %>
<%! from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers %>
${_("We received a request to change the e-mail associated with your "

1
lms/templates/emails/email_change_subject.txt
View File

@@ -1,3 +1,4 @@
## mako
<%! from django.utils.translation import ugettext as _ %>
<%! from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers %>
${_("Request to change {platform_name} account e-mail").format(

43
lms/templates/emails/enroll_email_allowedmessage.txt
View File

@@ -1,43 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear student,")}
${_("You have been invited to join {course_name} at {site_name} by a "
"member of the course staff.").format(
course_name=display_name or course.display_name_with_default_escaped,
site_name=site_name
)}
% if is_shib_course:
% if auto_enroll:
${_("To access the course visit {course_url} and login.").format(course_url=course_url)}
% elif course_about_url is not None:
${_("To access the course visit {course_about_url} and register for the course.").format(
course_about_url=course_about_url)}
% endif
% else:
${_("To finish your registration, please visit {registration_url} and fill "
"out the registration form making sure to use {email_address} in the E-mail field.").format(
registration_url=registration_url,
email_address=email_address
)}
% if auto_enroll:
${_("Once you have registered and activated your account, you will see "
"{course_name} listed on your dashboard.").format(
course_name=display_name or course.display_name_with_default_escaped
)}
% elif course_about_url is not None:
${_("Once you have registered and activated your account, visit {course_about_url} "
"to join the course.").format(course_about_url=course_about_url)}
% else:
${_("You can then enroll in {course_name}.").format(course_name=display_name or course.display_name_with_default_escaped)}
% endif
% endif
----
${_("This email was automatically sent from {site_name} to "
"{email_address}").format(
site_name=site_name, email_address=email_address
)}

5
lms/templates/emails/enroll_email_allowedsubject.txt
View File

@@ -1,5 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("You have been invited to register for {course_name}").format(
course_name=display_name or course.display_name_with_default_escaped
)}

20
lms/templates/emails/enroll_email_enrolledmessage.txt
View File

@@ -1,20 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been enrolled in {course_name} at {site_name} by a member "
"of the course staff. The course should now appear on your {site_name} "
"dashboard.").format(
course_name=display_name or course.display_name_with_default_escaped,
site_name=site_name
)}
${_("To start accessing course materials, please visit {course_url}").format(
course_url=course_url
)}
----
${_("This email was automatically sent from {site_name} to "
"{full_name}").format(
site_name=site_name, full_name=full_name
)}

5
lms/templates/emails/enroll_email_enrolledsubject.txt
View File

@@ -1,5 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("You have been enrolled in {course_name}").format(
course_name=display_name or course.display_name_with_default_escaped
)}

1
lms/templates/emails/order_confirmation_email.txt
View File

@@ -1,3 +1,4 @@
## mako
<%! from django.utils.translation import ugettext as _ %>
${_("Hi {name},").format(name=order.user.profile.name)}

1
lms/templates/emails/photo_submission_confirmation.txt
View File

@@ -1,3 +1,4 @@
## mako
<%! from django.utils.translation import ugettext as _ %>
${_("Hi {full_name},").format(full_name=full_name)}

1
lms/templates/emails/registration_codes_sale_email.txt
View File

@@ -1,3 +1,4 @@
## mako
<%! from django.utils.translation import ugettext as _ %>
${_("Thank you for purchasing enrollments in {course_name}.").format(course_name=course.display_name)}

1
lms/templates/emails/registration_codes_sale_invoice_attachment.txt
View File

@@ -1,3 +1,4 @@
## mako
<%! from django.utils.translation import ugettext as _ %>
${_("INVOICE")}

1
lms/templates/emails/reject_name_change.txt
View File

@@ -1,3 +1,4 @@
## mako
<%! from django.utils.translation import ugettext as _ %>
<%namespace name='static' file='../static_content.html'/>
(Not currently used)

18
lms/templates/emails/remove_beta_tester_email_message.txt
View File

@@ -1,18 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been removed as a beta tester for {course_name} at {site_name} by a "
"member of the course staff. The course will remain on your dashboard, but "
"you will no longer be part of the beta testing group.").format(
course_name=course.display_name_with_default_escaped,
site_name=site_name
)}
${_("Your other courses have not been affected.")}
----
${_("This email was automatically sent from {site_name} to "
"{email_address}").format(
site_name=site_name, email_address=email_address
)}

5
lms/templates/emails/remove_beta_tester_email_subject.txt
View File

@@ -1,5 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("You have been removed from a beta test for {course_name}").format(
course_name=course.display_name_with_default_escaped
)}

1
lms/templates/emails/reverification_processed.txt
View File

@@ -1,3 +1,4 @@
## mako
<%! from django.utils.translation import ugettext as _ %>
% if status == "approved":
${_("We have successfully verified your identity for the {assessment} assessment in the {course_name} course."

13
lms/templates/emails/unenroll_email_allowedmessage.txt
View File

@@ -1,13 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear Student,")}
${_("You have been un-enrolled from course {course_name} by a member "
"of the course staff. Please disregard the invitation "
"previously sent.").format(course_name=display_name or course.display_name_with_default_escaped)}
----
${_("This email was automatically sent from {site_name} "
"to {email_address}").format(
site_name=site_name, email_address=email_address
)}

17
lms/templates/emails/unenroll_email_enrolledmessage.txt
View File

@@ -1,17 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been un-enrolled in {course_name} at {site_name} by a member "
"of the course staff. The course will no longer appear on your "
"{site_name} dashboard.").format(
course_name=display_name or course.display_name_with_default_escaped, site_name=site_name
)}
${_("Your other courses have not been affected.")}
----
${_("This email was automatically sent from {site_name} to "
"{full_name}").format(
full_name=full_name, site_name=site_name
)}

5
lms/templates/emails/unenroll_email_subject.txt
View File

@@ -1,5 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("You have been un-enrolled from {course_name}").format(
course_name=display_name or course.display_name_with_default_escaped
)}

41
lms/templates/instructor/edx_ace/accountcreationandenrollment/email/body.html Normal file
View File

@@ -0,0 +1,41 @@
{% extends 'ace_common/edx_ace/common/base_body.html' %}
{% load i18n %}
{% load static %}
{% block content %}
<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td>
<h1>
{% blocktrans %}
Welcome to {{ course_name }}
{% endblocktrans %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}To get started, please visit https://{{ site_name }}.{% endblocktrans %}
<br />
</p>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}The login information for your account follows:{% endblocktrans %}
<br />
{% blocktrans %}email: {{ email_address }}{% endblocktrans %}
<br />
{% blocktrans %}password: {{ password }}{% endblocktrans %}
<br />
</p>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}It is recommended that you change your password.{% endblocktrans %}
<br />
</p>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}Sincerely yours, The {{ course_name }} Team{% endblocktrans %}
<br />
</p>
</td>
</tr>
</table>
{% endblock %}

11
lms/templates/instructor/edx_ace/accountcreationandenrollment/email/body.txt Normal file
View File

@@ -0,0 +1,11 @@
{% load i18n %}{% autoescape off %}{% blocktrans %}Welcome to {{ course_name }}{% endblocktrans %}
{% blocktrans %}To get started, please visit https://{{ site_name }}. The login information for your account follows.{% endblocktrans %}
{% blocktrans %}email: {{ email_address }}{% endblocktrans %}
{% blocktrans %}password: {{ password }}{% endblocktrans %}
{% blocktrans %}It is recommended that you change your password.{% endblocktrans %}
{% blocktrans %}Sincerely yours, The {{ course_name }} Team{% endblocktrans %}{% endautoescape %}

1
lms/templates/instructor/edx_ace/accountcreationandenrollment/email/from_name.txt Normal file
View File

@@ -0,0 +1 @@
{{ platform_name }}

1
lms/templates/instructor/edx_ace/accountcreationandenrollment/email/head.html Normal file
View File

@@ -0,0 +1 @@
{% extends 'ace_common/edx_ace/common/base_head.html' %}

4
lms/templates/instructor/edx_ace/accountcreationandenrollment/email/subject.txt Normal file
View File

@@ -0,0 +1,4 @@
{% load i18n %}
{% autoescape off %}
{% blocktrans %}You have been enrolled in {{ course_name }}{% endblocktrans %}
{% endautoescape %}

52
lms/templates/instructor/edx_ace/addbetatester/email/body.html Normal file
View File

@@ -0,0 +1,52 @@
{% extends 'ace_common/edx_ace/common/base_body.html' %}
{% load i18n %}
{% load static %}
{% block content %}
<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td>
<h1>
{% blocktrans %}
You have been invited to be a beta tester for {{ course_name }} at {{ site_name }}
{% endblocktrans %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}The invitation has been sent by a member of the course staff.{% endblocktrans %}
<br />
</p>
{% if auto_enroll %}
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}To start accessing course materials, please visit:{% endblocktrans %}
<br />
</p>
{% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=display_name|default:course.display_name_with_default course_cta_url=course_url %}
{% elif course_about_url is not None %}
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}To enroll in this course and begin the beta test:{% endblocktrans %}
<br />
</p>
{% blocktrans asvar course_cta_text %}Visit {{ course_name }}{% endblocktrans %}
{% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=course_about_url %}
{% else %}
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}To enroll in this course and begin the beta test:{% endblocktrans %}
<br />
</p>
{% blocktrans asvar course_cta_text %}Visit {{ site_name }}{% endblocktrans %}
{% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=course_url %}
{% endif %}
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ email_address }}{% endblocktrans %}
<br />
</p>
</td>
</tr>
</table>
{% endblock %}

12
lms/templates/instructor/edx_ace/addbetatester/email/body.txt Normal file
View File

@@ -0,0 +1,12 @@
{% load i18n %}{% autoescape off %}{% blocktrans %}Dear {{ full_name }}{% endblocktrans %}
{% blocktrans %}You have been invited to be a beta tester for {{ course_name }} at {{ site_name }} by a member of the course staff.{% endblocktrans %}
{% if auto_enroll %}
{% blocktrans %}To start accessing course materials, please visit {{ course_url }}{% endblocktrans %}
{% elif course_about_url is not None %}
{% blocktrans %}Visit {{ course_about_url }} to enroll in this course and begin the beta test.{% endblocktrans %}
{% else %}
{% blocktrans %}Visit {{ site_name }} to enroll in this course and begin the beta test.{% endblocktrans %}
{% endif %}
----
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ email_address }}{% endblocktrans %}{% endautoescape %}

1
lms/templates/instructor/edx_ace/addbetatester/email/from_name.txt Normal file
View File

@@ -0,0 +1 @@
{{ platform_name }}

1
lms/templates/instructor/edx_ace/addbetatester/email/head.html Normal file
View File

@@ -0,0 +1 @@
{% extends 'ace_common/edx_ace/common/base_head.html' %}

4
lms/templates/instructor/edx_ace/addbetatester/email/subject.txt Normal file
View File

@@ -0,0 +1,4 @@
{% load i18n %}
{% autoescape off %}
{% blocktrans %}You have been invited to a beta test for {{ course_name }}{% endblocktrans %}
{% endautoescape %}

62
lms/templates/instructor/edx_ace/allowedenroll/email/body.html Normal file
View File

@@ -0,0 +1,62 @@
{% extends 'ace_common/edx_ace/common/base_body.html' %}
{% load i18n %}
{% load static %}
{% block content %}
<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td>
<h1>
{% blocktrans %}You have been invited to {{ course_name }}{% endblocktrans %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}You have been invited to join {{ course_name }} at {{ site_name }} by a member of the course staff.{% endblocktrans %}
<br />
</p>
{% if is_shib_course %}
{% if auto_enroll %}
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}To access this course click on the button below and login:{% endblocktrans %}
<br />
</p>
{% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_name course_cta_url=course_url %}
{% elif course_about_url is not None %}
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}To access this course visit it and register:{% endblocktrans %}
<br />
</p>
{% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_name course_cta_url=course_about_url %}
{% endif %}
{% else %}
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}Please finish your registration and fill out the registration form making sure to use {{ email_address }} in the Email field:{% endblocktrans %}
<br />
</p>
{% trans "Finish Your Registration" as button_cta_text %}
{% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=button_cta_text course_cta_url=registration_url %}
<p style="color: rgba(0,0,0,.75);">
{% if auto_enroll %}
{% blocktrans %}Once you have registered and activated your account, you will see {{ course_name }} listed on your dashboard.{% endblocktrans %}
{% elif course_about_url is not None %}
{% blocktrans %}Once you have registered and activated your account, you will be able to access this course:{% endblocktrans %}
{% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_name course_cta_url=course_about_url %}
{% else %}
{% blocktrans %}You can then enroll in {{ course_name }}.{% endblocktrans %}
{% endif %}
<br />
</p>
{% endif %}
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ email_address }}{% endblocktrans %}
<br />
</p>
</td>
</tr>
</table>
{% endblock %}

14
lms/templates/instructor/edx_ace/allowedenroll/email/body.txt Normal file
View File

@@ -0,0 +1,14 @@
{% load i18n %}{% autoescape off %}{% blocktrans %}Dear student,{% endblocktrans %}
{% blocktrans %}You have been invited to join {{ course_name }} at {{ site_name }} by a member of the course staff.{% endblocktrans %}
{% if is_shib_course %}{% if auto_enroll %}{% blocktrans %}To access this course visit {{ course_url }} and login.{% endblocktrans %}
{% elif course_about_url is not None %}
{% blocktrans %}To access this course visit {{ course_about_url }} and register for this course.{% endblocktrans %}
{% endif %}
{% else %}{% blocktrans %}To finish your registration, please visit {{ registration_url }} and fill out the registration form making sure to use {{ email_address }} in the Email field.{% endblocktrans %}
{% if auto_enroll %}{% blocktrans %}Once you have registered and activated your account, you will see {{ course_name }} listed on your dashboard.{% endblocktrans %}
{% elif course_about_url is not None %}{% blocktrans %}Once you have registered and activated your account, visit {{ course_about_url }} to join this course.{% endblocktrans %}
{% else %}{% blocktrans %}You can then enroll in {{ course_name }}.{% endblocktrans %}
{% endif %}
{% endif %}----
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ email_address }}{% endblocktrans %}{% endautoescape %}

1
lms/templates/instructor/edx_ace/allowedenroll/email/from_name.txt Normal file
View File

@@ -0,0 +1 @@
{{ platform_name }}

1
lms/templates/instructor/edx_ace/allowedenroll/email/head.html Normal file
View File

@@ -0,0 +1 @@
{% extends 'ace_common/edx_ace/common/base_head.html' %}

4
lms/templates/instructor/edx_ace/allowedenroll/email/subject.txt Normal file
View File

@@ -0,0 +1,4 @@
{% load i18n %}
{% autoescape off %}
{% blocktrans %}You have been invited to register for {{ course_name }}{% endblocktrans %}
{% endautoescape %}

25
lms/templates/instructor/edx_ace/allowedunenroll/email/body.html Normal file
View File

@@ -0,0 +1,25 @@
{% extends 'ace_common/edx_ace/common/base_body.html' %}
{% load i18n %}
{% load static %}
{% block content %}
<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td>
<h1>
{% blocktrans %}You have been unenrolled from {{ course_name }}{% endblocktrans %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}You have been unenrolled from the course {{ course_name }} by a member of the course staff. Please disregard the invitation previously sent.{% endblocktrans %}
<br />
</p>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ email_address }}{% endblocktrans %}
<br />
</p>
</td>
</tr>
</table>
{% endblock %}

6
lms/templates/instructor/edx_ace/allowedunenroll/email/body.txt Normal file
View File

@@ -0,0 +1,6 @@
{% load i18n %}{% autoescape off %}{% blocktrans %}Dear Student,{% endblocktrans %}
{% blocktrans %}You have been unenrolled from the course {{ course_name }} by a member of the course staff. Please disregard the invitation previously sent.{% endblocktrans %}
----
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ email_address }}{% endblocktrans %}{% endautoescape %}

1
lms/templates/instructor/edx_ace/allowedunenroll/email/from_name.txt Normal file
View File

@@ -0,0 +1 @@
{{ platform_name }}

1
lms/templates/instructor/edx_ace/allowedunenroll/email/head.html Normal file
View File

@@ -0,0 +1 @@
{% extends 'ace_common/edx_ace/common/base_head.html' %}

4
lms/templates/instructor/edx_ace/allowedunenroll/email/subject.txt Normal file
View File

@@ -0,0 +1,4 @@
{% load i18n %}
{% autoescape off %}
{% blocktrans %}You have been unenrolled from {{ course_name }}{% endblocktrans %}
{% endautoescape %}

32
lms/templates/instructor/edx_ace/enrolledunenroll/email/body.html Normal file
View File

@@ -0,0 +1,32 @@
{% extends 'ace_common/edx_ace/common/base_body.html' %}
{% load i18n %}
{% load static %}
{% block content %}
<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td>
<h1>
{% blocktrans %}
You have been unenrolled from {{ course_name }}
{% endblocktrans %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% 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 %}
<br />
</p>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}Your other courses have not been affected.{% endblocktrans %}
<br />
</p>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ full_name }}{% endblocktrans %}
<br />
</p>
</td>
</tr>
</table>
{% endblock %}

8
lms/templates/instructor/edx_ace/enrolledunenroll/email/body.txt Normal file
View File

@@ -0,0 +1,8 @@
{% load i18n %}{% autoescape off %}{% blocktrans %}Dear {{ full_name }}{% endblocktrans %}
{% 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 %}
{% blocktrans %}Your other courses have not been affected.{% endblocktrans %}
----
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ full_name }}{% endblocktrans %}{% endautoescape %}

1
lms/templates/instructor/edx_ace/enrolledunenroll/email/from_name.txt Normal file
View File

@@ -0,0 +1 @@
{{ platform_name }}

1
lms/templates/instructor/edx_ace/enrolledunenroll/email/head.html Normal file
View File

@@ -0,0 +1 @@
{% extends 'ace_common/edx_ace/common/base_head.html' %}

4
lms/templates/instructor/edx_ace/enrolledunenroll/email/subject.txt Normal file
View File

@@ -0,0 +1,4 @@
{% load i18n %}
{% autoescape off %}
{% blocktrans %}You have been unenrolled from {{ course_name }}{% endblocktrans %}
{% endautoescape %}

30
lms/templates/instructor/edx_ace/enrollenrolled/email/body.html Normal file
View File

@@ -0,0 +1,30 @@
{% extends 'ace_common/edx_ace/common/base_body.html' %}
{% load i18n %}
{% load static %}
{% block content %}
<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td>
<h1>
{% blocktrans %}
You have been enrolled in {{ course_name }}
{% endblocktrans %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% 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 %}
<br />
</p>
{% trans "Access the Course Materials Now" as course_cta_text %}
{% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=course_url %}
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ full_name }}{% endblocktrans %}
<br />
</p>
</td>
</tr>
</table>
{% endblock %}

9
lms/templates/instructor/edx_ace/enrollenrolled/email/body.txt Normal file
View File

@@ -0,0 +1,9 @@
{% load i18n %}{% autoescape off %}{% blocktrans %}Dear {{ full_name }}{% endblocktrans %}
{% 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 %}
{% blocktrans %}To start accessing course materials, please visit {{ course_url }}{% endblocktrans %}
----
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ full_name }}{% endblocktrans %}
{% endautoescape %}

1
lms/templates/instructor/edx_ace/enrollenrolled/email/from_name.txt Normal file
View File

@@ -0,0 +1 @@
{{ platform_name }}

1
lms/templates/instructor/edx_ace/enrollenrolled/email/head.html Normal file
View File

@@ -0,0 +1 @@
{% extends 'ace_common/edx_ace/common/base_head.html' %}

4
lms/templates/instructor/edx_ace/enrollenrolled/email/subject.txt Normal file
View File

@@ -0,0 +1,4 @@
{% load i18n %}
{% autoescape off %}
{% blocktrans %}You have been enrolled in {{ course_name }}{% endblocktrans %}
{% endautoescape %}

35
lms/templates/instructor/edx_ace/removebetatester/email/body.html Normal file
View File

@@ -0,0 +1,35 @@
{% extends 'ace_common/edx_ace/common/base_body.html' %}
{% load i18n %}
{% load static %}
{% block content %}
<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
<tr>
<td>
<h1>
{% blocktrans %}You have been removed as a beta tester for {{ course_name }} at {{ site_name }}{% endblocktrans %}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}You have been removed as a beta tester for {{ course_name }} at {{ site_name }} by a member of the course staff.{% endblocktrans %}
<br />
</p>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}This course will remain on your dashboard, but you will no longer be part of the beta testing group.{% endblocktrans %}
<br />
</p>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}Your other courses have not been affected.{% endblocktrans %}
<br />
</p>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ email_address }}{% endblocktrans %}
<br />
</p>
</td>
</tr>
</table>
{% endblock %}

8
lms/templates/instructor/edx_ace/removebetatester/email/body.txt Normal file
View File

@@ -0,0 +1,8 @@
{% load i18n %}{% autoescape off %}{% blocktrans %}Dear {{ full_name }}{% endblocktrans %}
{% blocktrans %}You have been removed as a beta tester for {{ course_name }} at {{ site_name }} by a member of the course staff. This course will remain on your dashboard, but you will no longer be part of the beta testing group.{% endblocktrans %}
{% blocktrans %}Your other courses have not been affected.{% endblocktrans %}
----
{% blocktrans %}This email was automatically sent from {{ site_name }} to {{ email_address }}{% endblocktrans %}{% endautoescape %}

1
lms/templates/instructor/edx_ace/removebetatester/email/from_name.txt Normal file
View File

@@ -0,0 +1 @@
{{ platform_name }}

1
lms/templates/instructor/edx_ace/removebetatester/email/head.html Normal file
View File

@@ -0,0 +1 @@
{% extends 'ace_common/edx_ace/common/base_head.html' %}

4
lms/templates/instructor/edx_ace/removebetatester/email/subject.txt Normal file
View File

@@ -0,0 +1,4 @@
{% load i18n %}
{% autoescape off %}
{% blocktrans %}You have been removed from a beta test for {{ course_name }}{% endblocktrans %}
{% endautoescape %}

34
openedx/core/djangoapps/ace_common/tests/mixins.py
View File

@@ -1,5 +1,12 @@
# pylint: disable=missing-docstring
from urlparse import parse_qs, urlparse
import uuid
from django.http import HttpRequest
from mock import patch
from edx_ace import Message, Recipient
from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory
from student.tests.factories import UserFactory
class QueryStringAssertionMixin(object):
@@ -52,3 +59,30 @@ class QueryStringAssertionMixin(object):
parsed_qs = parse_qs(parsed_url.query)
for expected_key, expected_value in kwargs.items():
self.assertEqual(parsed_qs[expected_key], [str(expected_value)])
class EmailTemplateTagMixin(object):
def setUp(self):
super(EmailTemplateTagMixin, self).setUp()
patcher = patch('openedx.core.djangoapps.ace_common.templatetags.ace.get_current_request')
self.mock_get_current_request = patcher.start()
self.addCleanup(patcher.stop)
self.fake_request = HttpRequest()
self.fake_request.user = UserFactory.create()
self.fake_request.site = SiteFactory.create()
self.fake_request.site.domain = 'example.com'
self.mock_get_current_request.return_value = self.fake_request
self.message = Message(
app_label='test_app_label',
name='test_name',
recipient=Recipient(username='test_user'),
context={},
send_uuid=uuid.uuid4(),
)
self.context = {
'message': self.message
}

33
openedx/core/djangoapps/ace_common/tests/test_templatetags.py
View File

@@ -1,22 +1,16 @@
# pylint: disable=missing-docstring
import uuid
from django.http import HttpRequest
from django.template import VariableDoesNotExist
from django.test import override_settings
from mock import patch
from edx_ace import Message, Recipient
from openedx.core.djangoapps.ace_common.templatetags.ace import (
ensure_url_is_absolute,
with_link_tracking,
google_analytics_tracking_pixel,
_get_google_analytics_tracking_url
)
from openedx.core.djangoapps.ace_common.tests.mixins import QueryStringAssertionMixin
from openedx.core.djangoapps.ace_common.tests.mixins import EmailTemplateTagMixin, QueryStringAssertionMixin
from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory
from openedx.core.djangolib.testing.utils import CacheIsolationTestCase, skip_unless_lms
from student.tests.factories import UserFactory
@skip_unless_lms
@@ -40,31 +34,6 @@ class TestAbsoluteUrl(CacheIsolationTestCase):
self.assertEqual(absolute, 'https://some-cdn.com/foo/bar')
class EmailTemplateTagMixin(object):
def setUp(self):
patcher = patch('openedx.core.djangoapps.ace_common.templatetags.ace.get_current_request')
self.mock_get_current_request = patcher.start()
self.addCleanup(patcher.stop)
self.fake_request = HttpRequest()
self.fake_request.user = UserFactory.create()
self.fake_request.site = SiteFactory.create()
self.fake_request.site.domain = 'example.com'
self.mock_get_current_request.return_value = self.fake_request
self.message = Message(
app_label='test_app_label',
name='test_name',
recipient=Recipient(username='test_user'),
context={},
send_uuid=uuid.uuid4(),
)
self.context = {
'message': self.message
}
@skip_unless_lms
class TestLinkTrackingTag(QueryStringAssertionMixin, EmailTemplateTagMixin, CacheIsolationTestCase):