Merge pull request #11102 from edx/peter-fogg/active-email-text-change

Add mailing address to activation email form.

lms/envs/aws.py

@@ -211,6 +211,8 @@ FINANCE_EMAIL = ENV_TOKENS.get('FINANCE_EMAIL', FINANCE_EMAIL)
 UNIVERSITY_EMAIL = ENV_TOKENS.get('UNIVERSITY_EMAIL', UNIVERSITY_EMAIL)
 PRESS_EMAIL = ENV_TOKENS.get('PRESS_EMAIL', PRESS_EMAIL)
 
+CONTACT_MAILING_ADDRESS = ENV_TOKENS.get('CONTACT_MAILING_ADDRESS', CONTACT_MAILING_ADDRESS)
+
 # Currency
 PAID_COURSE_REGISTRATION_CURRENCY = ENV_TOKENS.get('PAID_COURSE_REGISTRATION_CURRENCY',
                                                    PAID_COURSE_REGISTRATION_CURRENCY)

lms/envs/common.py

@@ -792,6 +792,10 @@ BUGS_EMAIL = 'bugs@example.com'
 UNIVERSITY_EMAIL = 'university@example.com'
 PRESS_EMAIL = 'press@example.com'
 FINANCE_EMAIL = ''
+
+# Platform mailing address
+CONTACT_MAILING_ADDRESS = ''
+
 ADMINS = ()
 MANAGERS = ADMINS
 

lms/templates/emails/activation_email.txt

@@ -19,11 +19,16 @@ ${_("After you activate your account, you can sign up for "
     "and take any of the hundreds of courses {platform_name} offers."
   ).format(platform_name=settings.PLATFORM_NAME)}
 
+${_("Once you have activated your account, edX will send you email "
+    "from time to time about new courses or other information.")}
+
 ${_("If you need help, please use our web form at "
-    "{contact_us_url} or email {info_email_address}."
+    "{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_email_address=settings.CONTACT_EMAIL,
+    info_postal_address=settings.CONTACT_MAILING_ADDRESS
   )}
 
 ${_("We hope you enjoy learning with {platform_name}!").format(