Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
code.vt.edu will be down for maintenance from 0530-0630 EDT Wednesday, March 26th
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
9219cbdc
Commit
9219cbdc
authored
10 years ago
by
Renzo Lucioni
Browse files
Options
Downloads
Patches
Plain Diff
Fix 3rd party auth string interpolation, address design feedback
parent
93a263b9
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
common/djangoapps/student/views.py
+7
-6
7 additions, 6 deletions
common/djangoapps/student/views.py
with
7 additions
and
6 deletions
common/djangoapps/student/views.py
+
7
−
6
View file @
9219cbdc
...
...
@@ -884,12 +884,13 @@ def login_user(request, error=""): # pylint: disable-msg=too-many-statements,un
u
'
Login failed - user with username {username} has no social auth with backend_name {backend_name}
'
.
format
(
username
=
username
,
backend_name
=
backend_name
))
return
HttpResponseBadRequest
(
_
(
"
You
'
ve successfully logged into your {provider_name} account, but this account
"
"
isn
'
t linked with an {platform_name} account yet. Use your {platform_name} username and
"
"
password to log into {platform_name} below, and then link your {platform_name} account with
"
"
{provider_name} from your dashboard.
"
)
+
"
<br/><br/>
"
+
_
(
"
If you don
'
t have an {platform_name}
"
"
account yet, click <strong>Register Now</strong> at the top of the page.
"
).
format
(
platform_name
=
settings
.
PLATFORM_NAME
,
provider_name
=
requested_provider
.
NAME
),
_
(
"
You
'
ve successfully logged into your {provider_name} account, but this account isn
'
t linked with an {platform_name} account yet.
"
).
format
(
platform_name
=
settings
.
PLATFORM_NAME
,
provider_name
=
requested_provider
.
NAME
)
+
"
<br/><br/>
"
+
_
(
"
Use your {platform_name} username and password to log into {platform_name} below,
"
"
and then link your {platform_name} account with {provider_name} from your dashboard.
"
).
format
(
platform_name
=
settings
.
PLATFORM_NAME
,
provider_name
=
requested_provider
.
NAME
)
+
"
<br/><br/>
"
+
_
(
"
If you don
'
t have an {platform_name} account yet, click <strong>Register Now</strong> at the top of the page.
"
).
format
(
platform_name
=
settings
.
PLATFORM_NAME
),
content_type
=
"
text/plain
"
,
status
=
401
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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