Problem/Motivation
Limit this to one line easy fixes, avoid any possible controversy, or any change that would better fit with other words, such as doing chien and chiens in the same patch.
The list of words beginning with j -> m, inclusive, that are used once in one file.
Proposed resolution
- -layouted
- -lazyload
- -loreming
- -loremingipsum
- -loremipsum
- -loremipsumloremipsum
- -lowlevel
- -mame
- -minky
- -mlids
- -mosie
- -mple
Remaining tasks
Review
Commit
User interface changes
API changes
Data model changes
Release notes snippet
Comment | File | Size | Author |
---|---|---|---|
#82 | 3219475-82.patch | 13.2 KB | quietone |
#82 | diff-79-82.txt | 3.52 KB | quietone |
#79 | 3219475-79.patch | 13.36 KB | lucienchalom |
#79 | interdiff_62-79.txt | 3.57 KB | lucienchalom |
#79 | interdiff_78-79.txt | 2.96 KB | lucienchalom |
Issue fork drupal-3219475
Show commands
Start within a Git clone of the project using the version control instructions.
Or, if you do not have SSH keys set up on git.drupalcode.org:
Comments
Comment #2
quietone CreditAttribution: quietone as a volunteer commentedthis is j -> k
Comment #3
quietone CreditAttribution: quietone as a volunteer commentedAdding m and running tests.
Comment #4
longwaveDashes are wordsafe so this example is wrong now.
Comment #5
quietone CreditAttribution: quietone as a volunteer commentedComment #7
longwaveNeeds reroll and #4 also needs addressing.
Comment #8
quietone CreditAttribution: quietone as a volunteer commentedRerolled and ran spellcheck on core.
#4. I opted to add an ignore at the top of the file for this. I was thinking of changing the text to MyVeryLong... but, for me, that made it a bit harder to read the example.
Comment #9
quietone CreditAttribution: quietone as a volunteer commentedNeeded a reroll due to #3129043: Move core database drivers to modules of their own
Comment #10
quietone CreditAttribution: quietone as a volunteer commentedIgnore #8 and #9 - I uploaded the wrong patch.
This is a reroll from #3
#4. #4. I opted to add an ignore at the top of the file for this. I was thinking of changing the text to MyVeryLong... but, for me, that made it a bit harder to read the example.
Comment #11
quietone CreditAttribution: quietone as a volunteer commentedComment #12
murilohp CreditAttribution: murilohp at CI&T commentedHey, I made a new reroll based on #9. Moving back to NR.
Comment #13
karishmaamin CreditAttribution: karishmaamin at Specbee commentedRe-rolled patch against 9.4.x
Comment #14
longwaveThank you @quietone, @murilohp and @karishmaamin.
Patches #12 and #13 are identical except #13 has an extra blank line in DbDumpCommand, which looks more correct to me.
Everything else looks good so #13 is RTBC if the bot agrees.
Comment #15
xjmThanks for your work on this issue!
I read over all the changes in this issue. (I did not check to ensure each item was used only once, nor to verify that other j-m words still in the dictionary were either valid or used at least twice.)
A few things to fix:
I think it might be better to leave these in the dictionary. It seems strange to ignore them in only a single file since they are actually technical terms outside the context of those files. Especially for
LONGBLOB
-- I guess other terms likeLONGTEXT
must be used more than once, but we would end up with an ignore list of all the MySQL/Maria field types.As the object of a noun, this should probably be "lazy loading".
"To lazy-load X" (hyphenated) would be a transitive verb. "Lazy load" as a noun would be a load that is lazy (the load itself is like a lazy person), not a load that is done lazily. ;)
I think we can also get rid of "Loreming" here? Or, oh, I guess that out of scope because it's used twice. Never mind. Leaving my comment here in case another reviewer gets caught by that.
It looks like the indentation is wrong here. It was wrong before, but here it appears that we're changing it by one character too many in the other direction.
Here "low-level" should be hyphenated.
I think this is close once those points are addressed. Thanks!
Comment #16
quietone CreditAttribution: quietone at PreviousNext commented@xjm, thanks for the review.
#15.
1 - yes, they should stay in the dictionary. Done.
2 - done
3 - no change needed
4 - fixed
5 - fixed
@karishmaamin, when doing a reroll it is good practice to explain what you did and to add an interdiff.
Comment #17
longwaveAll review points were addressed - back to RTBC.
Comment #19
ravi.shankar CreditAttribution: ravi.shankar at OpenSense Labs commentedAdded reroll of patch #16 on Drupal 10.0.x.
Added interdiff of conflicts files.
Comment #20
ravi.shankar CreditAttribution: ravi.shankar at OpenSense Labs commentedIt's green so the setting status to needs review.
Comment #21
longwaveAnd the reroll is good so back to RTBC.
Comment #22
xjmJust to clarify -- I think
longblob
,mysqldump
, etc. should be left in the dictionary (not ignored inline) because they are terms it would be perfectly legitimate to use elsewhere in core. Thanks!Comment #23
andregp CreditAttribution: andregp at CI&T commentedMade changes according to comment #22 :)
Comment #25
Prem Suthar CreditAttribution: Prem Suthar at Srijan | A Material+ Company for Drupal India Association commentedI think so we need disable-next-line in the dictionary .maybe use elsewhere in core.
Comment #26
lucasscComment #27
lucasscI could not apply the patch in #23 neither for branch 10.0.x nor 9.5.x. Here's the output:
I'm novice, so I'm not sure if I just didn't set my local environment correctly. Keeping "Needs Review" for someone else check it out.
Despite that, it contemplates the changes suggested in #22: no longer ignoring inline
// cspell:ignore mysqldump
and// cspell:ignore longblob
; and keepinglongblob
andmysqldump
in the dictionary.With that, the list of words beginning with j -> m, with the exception of
longblob
andmysqldump
for the considerations in #15, was removed as proposed.I'm not sure if I understood right the comment #25, letting it for someone else too.
Comment #28
longwave#27 is correct, patch from #23 does not apply.
Comment #29
ravi.shankar CreditAttribution: ravi.shankar at OpenSense Labs commentedAdded reroll of patch #23 on Drupal 10.0.x.
Comment #30
sophiavs CreditAttribution: sophiavs at CI&T commentedHi, i'll be reviewing the last patch :)
Comment #31
sophiavs CreditAttribution: sophiavs at CI&T commentedthe patch from #29 still has an error
Comment #32
FeuerwagenComment #33
sophiavs CreditAttribution: sophiavs at CI&T commentedI created another patch an is know working with everything. Maintaining in needs work and the tag since the error already occurred 2 times.
Comment #34
ravi.shankar CreditAttribution: ravi.shankar at OpenSense Labs commentedAddressed Drupal CS issues of patch #33 and patch #29.
Removed the needs reroll tag.
Comment #35
lucasbaralmI reviewed the latest patch (both the drupal 9.5.x and 10.0.x versions), both apply without errors, address and resolve the issues in #33 and #29. As it passed all tests and presented no errors, I will be moving the issue to RTBC. Feel free to change the status of the issue if you believe there is still a pending discussion.
Comment #36
xjmThis is getting close, thanks! Just a couple points:
This should be hyphenated. I would actually say "Implement lazy-loading."
Could we just use a long enough real word here to avoid having to add the
cspell:ignore
?"low-level" should be hyphenated.
"meta-information" should be hyphenated.
Comment #37
ChrisDarke CreditAttribution: ChrisDarke commentedThis issue is tagged for first time contributors at DrupalCon Prague 2022.
Comment #38
Ratan Priya CreditAttribution: Ratan Priya at OpenSense Labs commentedComment #39
Ratan Priya CreditAttribution: Ratan Priya at OpenSense Labs commented@xjm,
Made changes as per comment #36.
Needs review.
Comment #40
volkswagenchickHi Ratan Priya, whilst everyones appreciates contributions and moving these issues forwards, in comment #37 Chris Darke had requested that this issue be held for Prague 2022 DrupalCon first time contributors.
I would encourage the reading of the issue comment thread prior to updating to make sure this is avoided as a lot of time is put into doing issue triage to identify these for the events.
Comment #41
petu CreditAttribution: petu at jobiqo - job board technology commentedI would try to work with this issue at DrupalCon Prague.
Comment #42
mdwornicki CreditAttribution: mdwornicki commented@petu how far did you get with this issue. I'm novice and would like to join and work together on this issue
Comment #43
petu CreditAttribution: petu commentedHi @hayburner,
no valuable progress so far.
Comment #45
quietone CreditAttribution: quietone at PreviousNext commentedAdding tag for the cspell spelling error issues.
Comment #46
longwaveLatest patches do not apply.
Comment #47
Medha KumariRerolled patch #39 in 9.5.x .
Comment #48
Nikhil_110 CreditAttribution: Nikhil_110 at Srijan | A Material+ Company commentedI have uploaded the patch against 9.5.x - Please review
Comment #49
Manoj Raj.R CreditAttribution: Manoj Raj.R as a volunteer and at ITT Digital commented#36 is in the latest patch i hope with cspell error/ignore
Comment #50
Akram KhanTested Patch #48 against 9.5.x and its applied successfully and dictionary.txt file changed after applying patch.
Comment #51
alexpottWe need a 10.x version of the patch too. Unfortunately the 9.5.x patch does not apply there.
Comment #52
Akram KhanCreated patch for 10.0.x by considering the comment of #51
Comment #53
Akram KhanUpdated patch as per to PHPCS
Comment #54
Akram KhanComment #55
Roshni_K CreditAttribution: Roshni_K as a volunteer and at Srijan | A Material+ Company for Drupal India Association commentedComment #56
Roshni_K CreditAttribution: Roshni_K as a volunteer and at Srijan | A Material+ Company for Drupal India Association commentedTested the patch from #53 for version 10.0.x .Patch is not applying and showing below error
Comment #57
ravi.shankar CreditAttribution: ravi.shankar at OpenSense Labs commentedThanks @Roshni_Kodiganti
Looks like patch #53 is getting applied on Drupal 10.0.x.
please try to take a pull and then apply the patch.
Thanks.
Comment #58
Roshni_K CreditAttribution: Roshni_K as a volunteer and at Srijan | A Material+ Company for Drupal India Association commentedTested the patch from #53 for version 10.0.x .and its applied successfully.
dictionary.txt file changed and all above mentioned words are removed from dictionary.txt after applying patch.
Comment #59
Roshni_K CreditAttribution: Roshni_K as a volunteer and at Srijan | A Material+ Company for Drupal India Association commentedComment #60
longwaveWe seem to have lost the changes suggested in #36. Some more notes:
Here we could use MyVeryLongURL and MyVeryLongURLExample in the docs instead of ignoring the words?
The indentation has been changed here, it is now misaligned compared to the other text.
Comment #61
longwave@Roshni_Kodiganti Thank you for looking into this issue.
Posting screenshots of your codebase does not advance the issue, since the automated testing infrastructure tells us whether the change set still applies correctly.
See the issue credit guidelines for more information.
Comment #62
lucienchalom CreditAttribution: lucienchalom at CI&T commentedhad to reroll from #53.
From #36:
1. done
2. changed to Pneumonoultramicroscopicsilicovolcanoconiosis. that took 3 works related to lorem ipsum form the dictionary.
But had to add Pneumonoultramicroscopicsili to a cspell ignore on the test because it does test the work if is cut beyond 28 characters.
3. done
4.done
from #60:
1. done
2. done
Comment #64
Prem Suthar CreditAttribution: Prem Suthar at Srijan | A Material+ Company for Drupal India Association commentedTry TO Fix The Failed #62 Patch.
Comment #66
adeshsharma CreditAttribution: adeshsharma at OpenSense Labs for DrupalFit commentedComment #67
adeshsharma CreditAttribution: adeshsharma at OpenSense Labs for DrupalFit commentedComment #68
smustgrave CreditAttribution: smustgrave at Mobomo commentedCleaning up credits for bad rerolls/empty commits as it's expected to check your patches before uploading.
Patch #62 seemed to address the points and at the time the only failure was a random one. Still need to double check that the points are addressed.
Hiding patches #64 (no interdiff and patch before applied fine) and #67 (reverted back to patch 52 so would miss any potential fixes in 62).
=====
Just FYI to help get the message out there.
Starting March 2023, simple rerolls, rebases, or merges will no longer receive issue credit. Only rerolls that address a merge conflict will be credited, and the merge conflict that was resolved must be documented in the text of an issue comment.
Example
error: patch failed: core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module:77
error: core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module: patch does not apply
To receive credit for contributing to this issue, assist with other outstanding tasks or unaddressed feedback.
See the issue credit guidelines for more information.
Comment #69
adeshsharma CreditAttribution: adeshsharma at OpenSense Labs for DrupalFit commentedAddressed the fixes in comment #62 in my patch.
Comment #70
smustgrave CreditAttribution: smustgrave at Mobomo commentedCC Failure.
BUT #67 skipped all the points there were attempted in #62.
So this appears to be carrying forward the wrong patch.
Think #62 should be the starting point.
Comment #73
adeshsharma CreditAttribution: adeshsharma at OpenSense Labs for DrupalFit commentedAddressed all issues including #62.
Comment #74
adeshsharma CreditAttribution: adeshsharma at OpenSense Labs for DrupalFit commentedChecking to see if "…" character got fixed in my last patch. Includes suggestions from #62.
Comment #75
smustgrave CreditAttribution: smustgrave at Mobomo commentedNot sure #62 was the starting point. The interdiffs say it was 67. also the file sizes slightly went up what was the additional file needed that wasn't in #62?
Comment #76
adeshsharma CreditAttribution: adeshsharma at OpenSense Labs for DrupalFit commentedComment #77
needs-review-queue-bot CreditAttribution: needs-review-queue-bot as a volunteer commentedThe Needs Review Queue Bot tested this issue. It no longer applies to Drupal core. Therefore, this issue status is now "Needs work".
Apart from a re-roll or rebase, this issue may need more work to address feedback in the issue or MR comments. To progress an issue, incorporate this feedback as part of the process of updating the issue. This helps other contributors to know what is outstanding.
Consult the Drupal Contributor Guide to find step-by-step guides for working with issues.
Comment #78
Prem Suthar CreditAttribution: Prem Suthar at Srijan | A Material+ Company for Drupal India Association commentedFix The Failed Patch #76.
also, Add The Interdiff FOr 76-78.
Comment #79
lucienchalom CreditAttribution: lucienchalom at CI&T commentedReading the patches, I did my best to unite from #62, #76 and #78. intediffs for all 3 of them.
I reverted the change that removed 'crc32' because its out of scope.
edit:
patch #62 and #76 does not apply in version 11.0.x and patch #79 does not apply in version 10.0.x.
what version should I focus on?
Comment #80
smustgrave CreditAttribution: smustgrave at Mobomo commentedCleaning up patches.
I think what you have in #79 is good. The words from the issue summary have been removed and aren't throwing errors.
Code has to be merged into 11.x first and backported later.
Comment #81
longwave#79 doesn't apply. As #80 says let's concentrate on an 11.x patch first and we will worry about backporting after that if necessary.
Comment #82
quietone CreditAttribution: quietone at PreviousNext commentedI applied the latest patch locally and rerolled. Then I looked back at the reviews, particularly those by xjm who is very good at spelling and grammar. I found that #36.1 was not done. That got me looking closer at the rerolls. I found that the reroll in #48 was incorrect and removed at the least the fix for #36.1. longwave spotted the problem, #60, but unfortunately, the next patch also didn't make the requested change.
There was no interdiff supplied in #48 so that didn't help other to spot it. But it is a reminder for all of us to make an interdiff and review it before working on a patch.
After that I went back through each review to make sure all the changes were made. I hope I didn't miss any. Here are the changes I made.
#15
1) Fixed, longblob and mysqldump stay in the dictionary. Same as #22
2) Fixed. Same as #36,1
3) Similar to #36.2
#36
1) Done,
Implement lazy-loading
.2) Reworked to avoid a word in the dictionary and an ignore line.
3- 4) were correct in the latest patch.
After, that I rebuillt the dictionary and updated the list of removed words in the issue summary.
Finally, I am removing credit for the creation of the MR, according to How is credit granted for Drupal core issues.
Comment #83
smustgrave CreditAttribution: smustgrave at Mobomo commentedReroll looks good.
Comment #86
longwaveThanks everyone - these spelling issues are taking longer than I ever imagined but we are finally getting some of them completed.
Committed 1bb050c and pushed to 11.x. Thanks!
Also backported to 10.1.x as the cherry-pick applied cleanly.
Comment #88
alexpottUnfortunately it looks like this patch fixed some spellings without updating the dictionary, for example:
litererally
- see #3386602: Remove incorrect spellings from the dictionary that are no longer in the codebase