Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
c71a1833
Commit
c71a1833
authored
10 years ago
by
Diana Huang
Committed by
Adam Palay
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update embargo copy.
ECOM-963 update copy in tests
parent
a1ffcc52
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
common/djangoapps/embargo/tests/test_middleware.py
+1
-1
1 addition, 1 deletion
common/djangoapps/embargo/tests/test_middleware.py
lms/templates/static_templates/embargo.html
+2
-4
2 additions, 4 deletions
lms/templates/static_templates/embargo.html
with
3 additions
and
5 deletions
common/djangoapps/embargo/tests/test_middleware.py
+
1
−
1
View file @
c71a1833
...
...
@@ -54,7 +54,7 @@ class EmbargoMiddlewareTests(ModuleStoreTestCase):
CourseEnrollment
.
enroll
(
self
.
user
,
self
.
regular_course
.
id
)
CourseEnrollment
.
enroll
(
self
.
user
,
self
.
embargo_course
.
id
)
# Text from lms/templates/static_templates/embargo.html
self
.
embargo_text
=
"
Unfortunately, at this time edX must comply with export controls, and we cannot allow you to access this
particular
course.
"
self
.
embargo_text
=
"
Unfortunately, at this time edX must comply with export controls, and we cannot allow you to access this course.
"
self
.
patcher
=
mock
.
patch
.
object
(
pygeoip
.
GeoIP
,
'
country_code_by_addr
'
,
self
.
mock_country_code_by_addr
)
self
.
patcher
.
start
()
...
...
This diff is collapsed.
Click to expand it.
lms/templates/static_templates/embargo.html
+
2
−
4
View file @
c71a1833
...
...
@@ -6,11 +6,9 @@
<section
class=
"outside-app"
>
<p>
${_("Our system indicates that you are trying to access this {platform_name} "
"course from a country currently subject to U.S. economic and trade "
"course from a country
or region
currently subject to U.S. economic and trade "
"sanctions. Unfortunately, at this time {platform_name} must comply with "
"export controls, and we cannot allow you to access this particular course. "
"Feel free to browse our catalogue to find other courses you may be "
"interested in taking."
"export controls, and we cannot allow you to access this course."
).format(
platform_name=settings.PLATFORM_NAME,
)}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment