Custom User without username and with USERNAME_FIELD = 'email', but still see username error message at the admin login page

[Val Neekman]

Have a custom user with no username and have set USERNAME_FIELD = 'email'.
All works great, however, the error messages are still pointing to the username even though the custom user had no username field.

Here is where the error message comes from.
ERROR_MESSAGE = ugettext_lazy("Please enter the correct username and password "

"for a staff account. Note that both fields are case-sensitive.")

[Val Neekman]

Admin Login with Email still warns about username

[Aymeric Augustin]

This message is hardcoded in django.contrib.admin.forms.AdminAuthenticationForm.

AdminAuthenticationForm inherits django.contrib.auth.forms.AuthenticationForm. That class is aware of custom user models: it sets an appropriate label on the username field.

AdminAuthenticationForm should reflect this. Replacing "username and password" by "credentials" should suffice.

[Aymeric Augustin]

Trivial patch attached, I'll just wait for a few days to see in case Russell disagrees.

This should be committed before the string freeze.

[Preston Holmes]

I'd only add that the language should be changed to say "Note that fields *may* be case-sensitive" which is sort of a cop out - but we now can't know the implementation, and it at least gives the user a heads up if they are forgetting that - esp for hidden PW field.

[Russell Keith-Magee]

Rather than try to find a generic term, we can substitute the name of the username field as an argument to the error message. The patch isn't that complicated, either; I'll commit shortly.

[Russell Keith-Magee <russell@…>]

In 27f8129d64292868f6a328f7bf9a1bed67967ff3:

Fixed #19368 -- Ensured that login error messages adapt to changes in the User model.

Thanks to un33k for the report.

[Russell Keith-Magee <russell@…>]

In 9534192c107aeaa1920408c0127920a4c61d9ca1:

[1.5.X] Fixed #19368 -- Ensured that login error messages adapt to changes in the User model.

Thanks to un33k for the report.

Backport of 27f8129d64292868f6a328f7bf9a1bed67967ff3 from master.

[Russell Keith-Magee <russell@…>]

In 9facca28b619ad94680cf07774ee7a377034ca42:

Corrected tests depending on the error message on the AuthenticationForm.

Refs #19368, and the fix introduced in 27f8129d64292868f6a328f7bf9a1bed67967ff3.

[Russell Keith-Magee <russell@…>]

In 06b5f5fcb6db2fc20e2d455a34f3f4b0293cfd8c:

[1.5.X] Corrected tests depending on the error message on the AuthenticationForm.

Refs #19368, and the fix introduced in 27f8129d64292868f6a328f7bf9a1bed67967ff3.

Backport of 9facca28b619ad94680cf07774ee7a377034ca42 from trunk.