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
e410cd97
Commit
e410cd97
authored
Jul 12, 2016
by
Cliff Dyer
Committed by
GitHub
Jul 12, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12981 from edx/adam/small-fix-to-rc
small fix to typo in activation email
parents
d728746d
5e6f89b0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
common/test/acceptance/tests/studio/test_studio_settings_details.py
+1
-1
themes/edx.org/lms/templates/emails/activation_email.txt
+1
-1
No files found.
common/test/acceptance/tests/studio/test_studio_settings_details.py
View file @
e410cd97
...
...
@@ -49,7 +49,7 @@ class SettingsMilestonesTest(StudioSettingsDetailsTest):
self
.
assertTrue
(
self
.
settings_detail
.
pre_requisite_course_options
)
@
flaky
# SOL-1811
@
skip
(
"Too flaky for the flaky decorator SOL-1811"
)
# SOL-1811
def
test_prerequisite_course_save_successfully
(
self
):
"""
Scenario: Selecting course from Pre-Requisite course drop down save the selected course as pre-requisite
...
...
themes/edx.org/lms/templates/emails/activation_email.txt
View file @
e410cd97
<%! 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: "
${_("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(
...
...
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