Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
238968c3
Commit
238968c3
authored
Dec 30, 2015
by
Peter Fogg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add mailing address to activation email form.
ECOM-3318
parent
a5f7f502
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
lms/envs/aws.py
+2
-0
lms/envs/common.py
+4
-0
lms/templates/emails/activation_email.txt
+7
-2
No files found.
lms/envs/aws.py
View file @
238968c3
...
...
@@ -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
View file @
238968c3
...
...
@@ -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
View file @
238968c3
...
...
@@ -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(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment