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

Remove edx.org theme override of activation email body.

Browse Source 
We have standardized the activation email in the base activation email body template, so we do not need this override any longer.

ENT-318
This commit is contained in:
Douglas Hall
2017-05-09 14:32:12 -04:00
parent 698475f5d3
commit 0a313da601
2 changed files with 1 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/djangoapps/student/tests/test_email.py
View File

@@ -85,15 +85,6 @@ class ActivationEmailTests(TestCase):
)
]
# Text fragments we expect in the body of an email
# sent from an EdX-controlled domain.
EDX_DOMAIN_FRAGMENTS = [
u"Thank you for creating an account with {platform}!".format(platform=settings.PLATFORM_NAME),
"http://edx.org/activate/",
"https://www.edx.org/contact-us",
"This email message was automatically sent by edx.org"
]
def test_activation_email(self):
self._create_account()
self._assert_activation_email(self.ACTIVATION_SUBJECT, self.OPENEDX_FRAGMENTS)
@@ -101,7 +92,7 @@ class ActivationEmailTests(TestCase):
@with_comprehensive_theme("edx.org")
def test_activation_email_edx_domain(self):
self._create_account()
self._assert_activation_email(self.ACTIVATION_SUBJECT, self.EDX_DOMAIN_FRAGMENTS)
self._assert_activation_email(self.ACTIVATION_SUBJECT, self.OPENEDX_FRAGMENTS)
def _create_account(self):
"""Create an account, triggering the activation email. """

44
themes/edx.org/lms/templates/emails/activation_email.txt
View File

@@ -1,44 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
${_("Thank you for creating an account with {platform_name}!").format(platform_name=settings.PLATFORM_NAME)}
${_("There's just one more step before you can enroll in a course: "
"You need to activate your {platform_name} account. To activate "
"your account, click the following link. If that doesn't work, "
"copy and paste the link into your browser's address bar.").format(
platform_name=settings.PLATFORM_NAME
)}
% if is_secure:
https://${ site }/activate/${ key }
% else:
http://${ site }/activate/${ key }
% endif
${_("After you activate your account, you can take "
"any of the hundreds of courses {platform_name} "
"offers. You will receive occasional email "
"messages from {platform_name} about new courses "
"or other information."
).format(platform_name=settings.PLATFORM_NAME)}
${_("If you need help, please use our web form at "
"{contact_us_url}, email {info_email_address}, "
"or write to {info_postal_address}."
).format(
contact_us_url="https://www.edx.org/contact-us",
info_email_address=settings.CONTACT_EMAIL,
info_postal_address=settings.CONTACT_MAILING_ADDRESS
)}
${_("We hope you enjoy learning with {platform_name}!").format(
platform_name=settings.PLATFORM_NAME
)}
${_("The {platform_name} Team").format(platform_name=settings.PLATFORM_NAME)}
${_("This email message was automatically sent by {site_name} because "
"someone attempted to create an account on {platform_name} using "
"this email address."
).format(
site_name=settings.SITE_NAME,
platform_name=settings.PLATFORM_NAME
)}