Merge from prerequisite branch

django_openid_auth/auth.py

@@ -187,7 +187,9 @@ class OpenIDBackend:
 
         if getattr(settings, 'OPENID_STRICT_USERNAMES', False):
             if User.objects.filter(username__exact=nickname).count() > 0:
-                raise DuplicateUsernameViolation("Duplicate username: %s" % nickname)
+                raise DuplicateUsernameViolation(
+                    "The username (%s) with which you tried to log in is "
+                    "already in use for a different account." % nickname)
 
         # Pick a username for the user based on their nickname,
         # checking for conflicts.

django_openid_auth/tests/test_views.py

@@ -836,7 +836,10 @@ class RelyingPartyTests(TestCase):
         # Status code should be 403: Forbidden
         self.assertEquals(403, response.status_code)
         self.assertContains(response, '<h1>OpenID failed</h1>', status_code=403)
-        self.assertContains(response, '<p>Duplicate username: someuser</p>', status_code=403)
+        self.assertContains(response,
+            "The username (someuser) with which you tried to log in is "
+            "already in use for a different account.",
+            status_code=403) status_code=403)
 
     def test_strict_username_duplicate_user_override(self):
         settings.OPENID_CREATE_USERS = True