e-mail changed to email in email validator

[Skylar Saveland]

I checked out 1.5 branch today and found a change that I can't find the debate/announcement for: e-mail to email in

django/core/validators.py:validate_email = EmailValidator(email_re, _('Enter a valid email address.'), 'invalid')

This change has me with

        # in 1.4.x it is:

        #error = 'Enter a valid e-mail address.'

        # in 1.5.x it is:

        #error = 'Enter a valid email address.'

        #self.assertFormError(res, 'form', 'email', error)

❯ git checkout 1.4.3

❯ grep -r "Enter a valid email address." *

(Nothing there)

~/Code/github/django (1f0af3c) ...

> git checkout master

~/Code/github/django (master) ↑

❯ grep -r "Enter a valid email address." *

.... (lot's of stuff)

I'm sure this was discussed and noted somewhere; but, where?

-Skylar

[Mark Lavin]

This was changed as part of https://code.djangoproject.com/ticket/17899

Best,

Mark

[Russell Keith-Magee]

As Mark noted, this is all a result of ticket #17899; however, there really wasn't a "discussion" per se. Django comes from a journalism background, and as such, we follow the Associated Press (AP) stylebook for language rules. In early 2011, AP announced they were changing their rules regarding email vs e-mail [1]; this was reported in a ticket, but a little too late for the 1.4 release, so it has been integrated into 1.5.

[1] https://twitter.com/APStylebook/status/48798366980780033

Yours,

Russ Magee %-)

[Skylar Saveland]

right-0, thanks guys. I must be getting old- I remember the style guidelines saying hyphen and thinking the hyphen was a little weird :)

Cheers!