From 9219cbdca861b9ecd2961b848c5dc841e9024e5b Mon Sep 17 00:00:00 2001
From: Renzo Lucioni <renzo@renzolucioni.com>
Date: Wed, 3 Sep 2014 10:43:23 -0400
Subject: [PATCH] Fix 3rd party auth string interpolation, address design
feedback
---
common/djangoapps/student/views.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 6d5f33758db..dedd2df7436 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -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
)
--
GitLab