Support for Drupal 7 is ending on 5 January 2025—it’s time to migrate to Drupal 10! Learn about the many benefits of Drupal 10 and find migration tools in our resource center.
Follow-up to #950534: [policy] Consistently use "email" instead of "e-mail" in Drupal
Problem/Motivation
Back in #950534: [policy] Consistently use "email" instead of "e-mail" in Drupal we changed all occurrences of "e-mail" to "email". Since then a few occurrences of "e-mail" have crept in.
Proposed resolution
Fix it.
Remaining tasks
User interface changes
Change e-mail to email in admin/people/permissions descriptions and on the user/edit form and login block.
API changes
None.
Data model changes
None.
Beta phase evaluation
Issue category | Task |
---|---|
Issue priority | Normal |
Unfrozen changes | Unfrozen because it only changes strings, mostly in comments and also in user interface as detailed above. |
Prioritized changes | Not a prioritized change. |
Disruption | Not disruptive. |
Comment | File | Size | Author |
---|---|---|---|
#36 | follow_up_consistently-2551453-36.patch | 9.57 KB | LoMo |
#33 | follow_up_consistently-2551453-33.patch.patch | 9.57 KB | LoMo |
| |||
#31 | replace_e-mail_with_email-2551453-31.patch | 9.57 KB | madhavvyas |
#24 | 2551453-interdiff-24-17.txt | 2.66 KB | jaxxed |
#24 | 2551453-24-replace_e-mail_with_email.patch | 9.57 KB | jaxxed |
Comments
Comment #2
LinL CreditAttribution: LinL commentedComment #3
LinL CreditAttribution: LinL commentedNo longer applies, tagging for reroll.
Maybe a good novice issue for Barcelona sprint?
Comment #4
Ayesh CreditAttribution: Ayesh commentedComment #5
Ayesh CreditAttribution: Ayesh commentedNot sure if this issue was only about the user module, but this patch fixes more than 2 references.
Comment #6
Ayesh CreditAttribution: Ayesh commentedComment #7
LoMo CreditAttribution: LoMo as a volunteer commentedGood. You are right, Ayesh, that there are quite a few instances of "e-mail" to fix outside of the user.module. And the patch looks good to me... except for one little thing:
Looks like you searched/replaced in the project, but also included a contrib module (Devel), so the patch does not apply. The fix is trivial, of course...
Comment #8
Ayesh CreditAttribution: Ayesh commentedSorry you are right I had it replaced in devel too. Thanks Lowell. Attaching an update :)
Comment #9
Ayesh CreditAttribution: Ayesh commentedComment #10
LoMo CreditAttribution: LoMo as a volunteer commentedLOL... I was just doing the same. But I guess that means I can still review. ;-)
Comment #11
LoMo CreditAttribution: LoMo as a volunteer commentedDamn... I thought I'd got rid of the attachment I uploaded. It should just be your patch.
Comment #12
LoMo CreditAttribution: LoMo as a volunteer commentedI think that looks good now and we should just get this into core before it needs another re-roll. Marking it RTBC. Nice work, Ayesh. :-)
Comment #14
LinL CreditAttribution: LinL commentedThanks Ayesh and LoMo! Patch is looking good, but any instances in files in core/modules/migrate_drupal should be left as they are as those files are generated by the migrate process.
See for example:
core/modules/migrate_drupal/src/Tests/Table/d6/MenuRouter.php
Setting to Needs work to exclude the migrate files.
Comment #17
Ayesh CreditAttribution: Ayesh commentedTrying again. Thanks Lin.
Comment #18
Ayesh CreditAttribution: Ayesh commentedComment #19
jaxxed CreditAttribution: jaxxed at Wunder commentedquick interdiff 17-8 (which was labelled 7)
Comment #20
LinL CreditAttribution: LinL commentedThanks Ayesh. Nearly there, I think. I just noticed (sorry missed it in my last review) that a couple of e-mails to emails changes in the original patch in #2 are missing.
Here:
and:
Comment #21
jaxxed CreditAttribution: jaxxed at Wunder commentedhere is a grep result list (post #17)
relevant possible targets:
EDIT: removed symfony vendor translations from target list as obviously we aren't responsible for that.
Comment #22
jaxxed CreditAttribution: jaxxed at Wunder commented@Linl what to do with translation targets? Some of the may require approval for noun declination changes (cs, et, nl, tr/)
EDIT: ignore me
Comment #23
jaxxed CreditAttribution: jaxxed at Wunder commentedLet's also note that a number of these changes are going to change deep core Drupal files, and may mean that plenty of other patches are going to require re-rolling. let's be careful with this one.
Comment #24
jaxxed CreditAttribution: jaxxed at Wunder commentedpatch from #17 with a few more cases added.
Comment #25
jaxxed CreditAttribution: jaxxed at Wunder commentedComment #26
jaxxed CreditAttribution: jaxxed at Wunder commentedComment #30
LinL CreditAttribution: LinL commentedThanks jaxxed. I think that has got them all now - I grepped for e-mail, e-mails, E-mail, E-mails, E-Mail, and E-Mails.
But now it needs another reroll following #2570355: Replace remaining !placeholder and @placeholder with :placeholder for URLs
Comment #31
madhavvyas CreditAttribution: madhavvyas as a volunteer and at CIGNEX commentedPatch re-rolled #24
Comment #32
madhavvyas CreditAttribution: madhavvyas as a volunteer and at CIGNEX commentedComment #33
LoMo CreditAttribution: LoMo as a volunteer commentedWow... so many more turned up with all the variations.
And now the patch doesn't apply, but I think I've fixed it; it was only one character changed elsewhere in one line.
I was hoping to see this back to RTBC, but I guess someone else needs to review this one again. ;-)
Comment #35
madhavvyas CreditAttribution: madhavvyas as a volunteer and at CIGNEX commentedComment #36
LoMo CreditAttribution: LoMo as a volunteer commentedI managed to mess up something in that last patch... sorry. This should do it.
Comment #37
LinL CreditAttribution: LinL commentedLatest patch is looking good. I can't really RTBC it as I did the original patch, but I think it is ready. (And we should wait for the testbot to come back green.)
Comment #41
LoMo CreditAttribution: LoMo as a volunteer commentedAnd I cannot RTBC, since I did the last patch, but it passed (at that time). Hopefully it still applies. I'm going to change to unassigned since this hasn't moved for some days and is a fairly simple review issue that could be finished today.
Comment #42
Miraya CreditAttribution: Miraya commentedI am working on this at the mentored sprint in Barcelona 2015. My mentor is jp.stacey . I am reviewing the patch as per https://www.drupal.org/patch/review
Comment #43
LinL CreditAttribution: LinL commentedThanks Miraya! And J-P. (Missing you all, wish I was there at the sprint too :-) Will follow along from here!)
Comment #44
Miraya CreditAttribution: Miraya commentedI reviewed the patch, it applies perfectly fine.
Also tested via grepping for 'e-mail', 'E-Mail', 'e-Mail', 'E-mail' as well as the plural forms. Nothing missing, nothing else is changed.
Comment #45
NikitaJain CreditAttribution: NikitaJain commentedfollow_up_consistently-2551453-36.patch patch no longer applies
Comment #46
Miraya CreditAttribution: Miraya commented@nikitajain: Patch applied fine on commit 1d1fe19702f5dc6894acc45431b1d0c85ab306d7. Can you give details to reproduce?
Comment #47
YesCT CreditAttribution: YesCT commentedComment #49
webchickCommitted LIVE at DrupalCon Barleona! :D
Comment #50
davidhernandezComment #51
YesCT CreditAttribution: YesCT commentedin #47 I had added a related issue... but d.o ate my changes. noting that so we can investigate.
Comment #52
Ayesh CreditAttribution: Ayesh commentedGracias everyone!
Comment #53
madhavvyas CreditAttribution: madhavvyas as a volunteer and at CIGNEX commentedGreat work!