diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt index 2af1fda000..d6716dc764 100644 --- a/lms/templates/emails/activation_email.txt +++ b/lms/templates/emails/activation_email.txt @@ -1,3 +1,5 @@ +<%namespace file="../main.html" import="stanford_theme_enabled" /> + Thank you for signing up for ${settings.PLATFORM_NAME}! To activate your account, please copy and paste this address into your web browser's address bar: @@ -8,7 +10,15 @@ browser's address bar: http://${ site }/activate/${ key } % endif -If you didn't request this, you don't need to do anything; you won't -receive any more email from us. Please do not reply to this e-mail; if -you require assistance, check the help section of the -${settings.PLATFORM_NAME} web site. +## Temporary hack until we develop a better way to adjust language +% if stanford_theme_enabled(): + If you didn't request this, you don't need to do anything; you won't + receive any more email from us. Please do not reply to this e-mail; + if you require assistance, check the about section of the + ${settings.PLATFORM_NAME} Courses web site. +% else: + If you didn't request this, you don't need to do anything; you won't + receive any more email from us. Please do not reply to this e-mail; + if you require assistance, check the help section of the + ${settings.PLATFORM_NAME} web site. +% endif diff --git a/lms/templates/emails/confirm_email_change.txt b/lms/templates/emails/confirm_email_change.txt index 6445a31fe8..165846fb80 100644 --- a/lms/templates/emails/confirm_email_change.txt +++ b/lms/templates/emails/confirm_email_change.txt @@ -1,13 +1,25 @@ <%! from django.core.urlresolvers import reverse %> -This is to confirm that you changed the e-mail associated with -${settings.PLATFORM_NAME} from ${old_email} to ${new_email}. If you -did not make this request, please contact us immediately. Contact -information is listed at: +<%namespace file="../main.html" import="stanford_theme_enabled" /> +## Again, ugly hack that needs to be changed +## TODO: this probably needs better formatting to look nice in an +## email client (Mako leaves awkward whitespace) +% if stanford_theme_enabled(): + This is to confirm that you changed the e-mail associated with + ${settings.PLATFORM_NAME} from ${old_email} to ${new_email}. If you + did not make this request, please contact us at -% if is_secure: - https://${ site }${reverse('contact')} + ${settings.CONTACT_EMAIL} % else: - http://${ site }${reverse('contact')} + This is to confirm that you changed the e-mail associated with + ${settings.PLATFORM_NAME} from ${old_email} to ${new_email}. If you + did not make this request, please contact us immediately. Contact + information is listed at: + + % if is_secure: + https://${ site }${reverse('contact')} + % else: + http://${ site }${reverse('contact')} + % endif % endif We keep a log of old e-mails, so if this request was unintentional, we diff --git a/lms/templates/emails/email_change.txt b/lms/templates/emails/email_change.txt index db3e62cb09..bff86e8da6 100644 --- a/lms/templates/emails/email_change.txt +++ b/lms/templates/emails/email_change.txt @@ -1,3 +1,4 @@ +<%namespace file="../main.html" import="stanford_theme_enabled" /> We received a request to change the e-mail associated with your ${settings.PLATFORM_NAME} account from ${old_email} to ${new_email}. If this is correct, please confirm your new e-mail address by @@ -9,7 +10,15 @@ visiting: http://${ site }/email_confirm/${ key } % endif -If you didn't request this, you don't need to do anything; you won't -receive any more email from us. Please do not reply to this e-mail; if -you require assistance, check the help section of the -${settings.PLATFORM_NAME} web site. +## TODO: fix this ugly hack +% if stanford_theme_enabled(): + If you didn't request this, you don't need to do anything; you won't + receive any more email from us. Please do not reply to this e-mail; + if you require assistance, check the about section of the + ${settings.PLATFORM_NAME} Courses web site. +% else: + If you didn't request this, you don't need to do anything; you won't + receive any more email from us. Please do not reply to this e-mail; + if you require assistance, check the help section of the + ${settings.PLATFORM_NAME} web site. +% endif diff --git a/lms/templates/emails/reject_name_change.txt b/lms/templates/emails/reject_name_change.txt index 37be970830..2e3d32169f 100644 --- a/lms/templates/emails/reject_name_change.txt +++ b/lms/templates/emails/reject_name_change.txt @@ -1,5 +1,14 @@ +<%namespace file="../main.html" import="stanford_theme_enabled" /> (Not currently used) -We are sorry. Our course staff did not approve your request to change -your name from ${old_name} to ${new_name}. If you need further -assistance, please e-mail the course staff at ta@edx.org. +## TODO: fix this ugly hack +% if stanford_theme_enabled(): + We are sorry. Our course staff did not approve your request to change + your name from ${old_name} to ${new_name}. If you need further + assistance, please e-mail the tech support at + ${settings.TECH_SUPPORT_EMAIL}. +% else: + We are sorry. Our course staff did not approve your request to change + your name from ${old_name} to ${new_name}. If you need further + assistance, please e-mail the course staff at ta@edx.org. +% endif diff --git a/lms/templates/emails/welcome_body.txt b/lms/templates/emails/welcome_body.txt index 81b6f98b5a..f7ffe45546 100644 --- a/lms/templates/emails/welcome_body.txt +++ b/lms/templates/emails/welcome_body.txt @@ -1,4 +1,10 @@ -${settings.PLATFORM_NAME} has launched! To log in, visit: +<%namespace file="../main.html" import="stanford_theme_enabled" /> +## TODO: fix ugly hack +% if stanford_theme_enabled(): + ${settings.PLATFORM_NAME} Courses has launched! To log in, visit: +% else: + ${settings.PLATFORM_NAME} has launched! To log in, visit: +% endif % if is_secure: https://${settings.SITE_NAME} @@ -14,7 +20,12 @@ place to reset it. Thanks for joining us for the ride! -The ${settings.PLATFORM_NAME} team +## TODO: fix ugly hack +% if stanford_theme_enabled(): + The ${settings.PLATFORM_NAME} Courses team +% else: + The ${settings.PLATFORM_NAME} team +% endif (Please note that this e-mail address does not receive e-mails -- if you need assistance, please use the help section of the web diff --git a/lms/templates/emails/welcome_subject.txt b/lms/templates/emails/welcome_subject.txt index e3406c3734..0b0f831f7e 100644 --- a/lms/templates/emails/welcome_subject.txt +++ b/lms/templates/emails/welcome_subject.txt @@ -1 +1,7 @@ -Welcome to ${settings.PLATFORM_NAME}! +<%namespace file="../main.html" import="stanford_theme_enabled" /> +## TODO: fix ugly hack +% if stanford_theme_enabled(): + Welcome to ${settings.PLATFORM_NAME} Courses! +% else: + Welcome to ${settings.PLATFORM_NAME}! +% endif