Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5056 from edx/renzo/third-party-auth-copy

Browse Source 
Fix 3rd party auth copy string interpolation, address design feedback
This commit is contained in:
Renzo Lucioni
2014-09-03 12:16:13 -04:00
parent a81ff98455 9219cbdca8
commit 6a151f0dc8
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/djangoapps/student/views.py
View File

@@ -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
)