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

  1. -layouted
  2. -lazyload
  3. -loreming
  4. -loremingipsum
  5. -loremipsum
  6. -loremipsumloremipsum
  7. -lowlevel
  8. -mame
  9. -minky
  10. -mlids
  11. -mosie
  12. -mple

Remaining tasks

Review
Commit

User interface changes

API changes

Data model changes

Release notes snippet

CommentFileSizeAuthor
#82 3219475-82.patch13.2 KBquietone
#82 diff-79-82.txt3.52 KBquietone
#79 3219475-79.patch13.36 KBlucienchalom
#79 interdiff_62-79.txt3.57 KBlucienchalom
#79 interdiff_78-79.txt2.96 KBlucienchalom
#79 interdiff_76-79.txt4.42 KBlucienchalom
#78 interdiff_76-78.txt2.31 KBPrem Suthar
#78 3219475-78.patch14.17 KBPrem Suthar
#77 3219475-nr-bot.txt85 bytesneeds-review-queue-bot
#76 interdiff-62-76.txt384 bytesadeshsharma
#76 3219475-76.patch14.24 KBadeshsharma
#74 interdiff-67-74.txt2.96 KBadeshsharma
#74 3219475-74.patch14.24 KBadeshsharma
#73 interdiff-69-73.txt687 bytesadeshsharma
#73 3219475-73.patch14.24 KBadeshsharma
#69 interdiff-67-69.txt2.97 KBadeshsharma
#69 3219475-69.patch14.24 KBadeshsharma
#67 interdiff-53-67.txt2.34 KBadeshsharma
#67 3219475-67.patch14.22 KBadeshsharma
#64 3219475-63.patch13.21 KBPrem Suthar
#62 interdiff_53-62.txt5.75 KBlucienchalom
#62 3219475-62.patch13.3 KBlucienchalom
#58 Screenshot 2022-11-21 at 6.44.22 PM.png246 KBRoshni_K
#53 3219475-53.patch13.17 KBAkram Khan
#52 3219475-52.patch13.18 KBAkram Khan
#50 Afterpatch.png195.76 KBAkram Khan
#50 Beforepatch.png172.06 KBAkram Khan
#48 3219475-48.patch13.77 KBNikhil_110
#47 reroll_diff_39-47.txt6.58 KBMedha Kumari
#47 3219475-47.patch13.85 KBMedha Kumari
#39 interdiff_34-39.txt2.9 KBRatan Priya
#39 3219475-39.patch13.88 KBRatan Priya
#34 interdiff_29-34-D10.txt795 bytesravi.shankar
#34 3219475-34-D10.patch13.87 KBravi.shankar
#34 interdiff_33-34-D9.txt795 bytesravi.shankar
#34 3219475-34-D9.patch13.86 KBravi.shankar
#33 3219475-32.patch13.82 KBsophiavs
#29 reroll_diff_23-29.txt3.04 KBravi.shankar
#29 3219475-29.patch13.84 KBravi.shankar
#23 diff_3219475_19-23.txt991 bytesandregp
#23 3219475-23.patch13.94 KBandregp
#19 reroll-diff.txt1.56 KBravi.shankar
#19 3219475-19.patch14.93 KBravi.shankar
#16 3219475-12.patch14.92 KBquietone
#16 interdiff-12-16.txt2.93 KBquietone
#13 3219475-12.patch14.81 KBkarishmaamin
#12 reroll_diff-9-12.txt3.01 KBmurilohp
#12 3219475-12.patch14.92 KBmurilohp
#10 3219475-9.patch15.63 KBquietone
#10 diff-3-9.txt6.46 KBquietone
#9 3219667-9.patch18.98 KBquietone
#9 diff-8-9.txt2.8 KBquietone
#8 3219667-8.patch18.44 KBquietone
#8 diff-3-8.txt6.57 KBquietone
#3 3219475-3.patch17.66 KBquietone
#3 interdiff-2-3.txt7.74 KBquietone
#2 3219475-2.patch8.29 KBquietone
j-m.txt696 bytesquietone

Issue fork drupal-3219475

Command icon 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:

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

quietone created an issue. See original summary.

quietone’s picture

FileSize
8.29 KB

this is j -> k

quietone’s picture

Issue summary: View changes
FileSize
7.74 KB
17.66 KB

Adding m and running tests.

longwave’s picture

+++ b/core/lib/Drupal/Component/Utility/Unicode.php
@@ -295,12 +295,12 @@ public static function ucwords($text) {
+   *   string "See my-very-long-url-example.com for more information" to a word-safe
    *   return length of 20, the only available word boundary within 20 characters
    *   is after the word "See", which wouldn't leave a very informative string. If

Dashes are wordsafe so this example is wrong now.

>>> \Drupal\Component\Utility\Unicode::truncate("See myverylongurlexample.com for more information", 20, TRUE);
=> "See"

>>> \Drupal\Component\Utility\Unicode::truncate("See my-very-long-url-example.com for more information", 20, TRUE);
=> "See my-very-long-url"
quietone’s picture

Assigned: quietone » Unassigned

Version: 9.3.x-dev » 9.4.x-dev

Drupal 9.3.0-rc1 was released on November 26, 2021, which means new developments and disruptive changes should now be targeted for the 9.4.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

longwave’s picture

Status: Needs review » Needs work
Issue tags: +Needs reroll

Needs reroll and #4 also needs addressing.

quietone’s picture

Status: Needs work » Needs review
Issue tags: -Needs reroll
FileSize
6.57 KB
18.44 KB

Rerolled 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.

quietone’s picture

quietone’s picture

Issue summary: View changes
FileSize
6.46 KB
15.63 KB

Ignore #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.

quietone’s picture

Status: Needs review » Needs work
Issue tags: +Needs reroll
murilohp’s picture

Status: Needs work » Needs review
Issue tags: -Needs reroll
FileSize
14.92 KB
3.01 KB

Hey, I made a new reroll based on #9. Moving back to NR.

karishmaamin’s picture

Re-rolled patch against 9.4.x

longwave’s picture

Status: Needs review » Reviewed & tested by the community

Thank 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.

xjm’s picture

Status: Reviewed & tested by the community » Needs work

Thanks 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:

  1. +++ b/core/lib/Drupal/Core/Command/DbDumpCommand.php
    @@ -8,6 +8,8 @@
    +// cspell:ignore mysqldump
    
    +++ b/core/misc/cspell/dictionary.txt
    @@ -736,14 +731,11 @@ localetranslatedirty
    -longblob
    ...
     longtext
    
    @@ -857,10 +840,7 @@ myclabs
    -mysqldump
    
    +++ b/core/modules/mysql/src/Driver/Database/mysql/Schema.php
    +++ b/core/modules/mysql/src/Driver/Database/mysql/Schema.php
    @@ -8,6 +8,8 @@
    
    @@ -8,6 +8,8 @@
    +// cspell:ignore longblob
    +
    

    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 like LONGTEXT must be used more than once, but we would end up with an ignore list of all the MySQL/Maria field types.

  2. +++ b/core/lib/Drupal/Core/Utility/ThemeRegistry.php
    @@ -55,7 +55,7 @@ public function __construct($cid, CacheBackendInterface $cache, LockBackendInter
    -    // @todo: Implement lazyload.
    +    // @todo: Implement lazy load.
    

    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. ;)

  3. +++ b/core/misc/cspell/dictionary.txt
    @@ -736,14 +731,11 @@ localetranslatedirty
     loreming
    -loremipsumloremipsum
    
    +++ b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
    @@ -247,9 +247,9 @@ public function testAutoFilledSubject() {
    -    $body_text2 = 'LoremipsumloremipsumLoremingipsumLoremipsum';
    +    $body_text2 = 'LoremIpsumLoremIpsumLoremingIpsumLorempsum';
    ...
    -    $this->assertEquals('LoremipsumloremipsumLoreming…', $comment2->getSubject());
    +    $this->assertEquals('LoremIpsumLoremIpsumLoreming…', $comment2->getSubject());
    

    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.

  4. +++ b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
    @@ -761,7 +761,7 @@ public function testUrlFilter() {
    -HTML www.example21.com soup by person@example22.com can litererally http://www.example23.com contain *img*<img> anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com.
    +  HTML www.example21.com soup by person@example22.com can literally http://www.example23.com contain *img*<img> anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com.
    

    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.

  5. +++ b/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
    @@ -241,7 +241,7 @@ private function formSubmitHelper($form, $edit) {
    -    // to allow the caller lowlevel access to the form.
    +    // to allow the caller low level access to the form.
    

    Here "low-level" should be hyphenated.

I think this is close once those points are addressed. Thanks!

quietone’s picture

@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.

longwave’s picture

Status: Needs review » Reviewed & tested by the community

All review points were addressed - back to RTBC.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 16: 3219475-12.patch, failed testing. View results

ravi.shankar’s picture

Added reroll of patch #16 on Drupal 10.0.x.

Added interdiff of conflicts files.

ravi.shankar’s picture

Status: Needs work » Needs review

It's green so the setting status to needs review.

longwave’s picture

Status: Needs review » Reviewed & tested by the community

And the reroll is good so back to RTBC.

xjm’s picture

Status: Reviewed & tested by the community » Needs work
+++ b/core/lib/Drupal/Core/Command/DbDumpCommand.php
@@ -8,6 +8,7 @@
 
+// cspell:ignore mysqldump
 /**

+++ b/core/modules/mysql/src/Driver/Database/mysql/Schema.php
@@ -8,6 +8,8 @@
 
+// cspell:ignore longblob
+

Just 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!

andregp’s picture

Status: Needs work » Needs review
FileSize
13.94 KB
991 bytes

Made changes according to comment #22 :)

Version: 9.4.x-dev » 9.5.x-dev

Drupal 9.4.0-alpha1 was released on May 6, 2022, which means new developments and disruptive changes should now be targeted for the 9.5.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Prem Suthar’s picture

+++ b/core/modules/quickedit/tests/src/Functional/QuickEditEndPointAccessTest.php
@@ -56,6 +56,7 @@ public function testEndPointAccess() {
 
     $edit = [];
     $edit['form_id'] = 'quickedit_field_form';
+    // cspell:disable-next-line

+++ b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
@@ -164,6 +164,7 @@ public function testValidRelative($url, $prefix) {
    */
   public function providerTestInvalidRelativeData() {
     $data = [
+      // cspell:disable-next-line

I think so we need disable-next-line in the dictionary .maybe use elsewhere in core.

lucassc’s picture

Assigned: Unassigned » lucassc
lucassc’s picture

Assigned: lucassc » Unassigned

I could not apply the patch in #23 neither for branch 10.0.x nor 9.5.x. Here's the output:

error: patch failed: core/misc/cspell/dictionary.txt:655
error: core/misc/cspell/dictionary.txt: patch does not apply

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 keeping longblob and mysqldump in the dictionary.

With that, the list of words beginning with j -> m, with the exception of longblob and mysqldump 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.

longwave’s picture

Status: Needs review » Needs work
Issue tags: +Needs reroll

#27 is correct, patch from #23 does not apply.

ravi.shankar’s picture

Added reroll of patch #23 on Drupal 10.0.x.

sophiavs’s picture

Assigned: Unassigned » sophiavs

Hi, i'll be reviewing the last patch :)

sophiavs’s picture

the patch from #29 still has an error

error: patch failed: core/misc/cspell/dictionary.txt:761
error: core/misc/cspell/dictionary.txt: patch does not apply

Feuerwagen’s picture

Status: Needs review » Needs work
Issue tags: +Needs reroll
sophiavs’s picture

Assigned: sophiavs » Unassigned
FileSize
13.82 KB

I created another patch an is know working with everything. Maintaining in needs work and the tag since the error already occurred 2 times.

ravi.shankar’s picture

Status: Needs work » Needs review
Issue tags: -Needs reroll
FileSize
13.86 KB
795 bytes
13.87 KB
795 bytes

Addressed Drupal CS issues of patch #33 and patch #29.

Removed the needs reroll tag.

lucasbaralm’s picture

Status: Needs review » Reviewed & tested by the community

I 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.

xjm’s picture

Status: Reviewed & tested by the community » Needs work
Issue tags: +Novice, +Prague2022

This is getting close, thanks! Just a couple points:

  1. +++ b/core/lib/Drupal/Core/Utility/ThemeRegistry.php
    @@ -55,7 +55,7 @@ public function __construct($cid, CacheBackendInterface $cache, LockBackendInter
    +    // @todo: Implement lazy load.
    

    This should be hyphenated. I would actually say "Implement lazy-loading."

  2. +++ b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
    @@ -247,9 +247,10 @@ public function testAutoFilledSubject() {
    +    // cspell:ignore Lorempsum
    +    $body_text2 = 'LoremIpsumLoremIpsumLoremingIpsumLorempsum';
    

    Could we just use a long enough real word here to avoid having to add the cspell:ignore?

  3. +++ b/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
    @@ -241,7 +241,7 @@ private function formSubmitHelper($form, $edit) {
    +    // to allow the caller low level access to the form.
    

    "low-level" should be hyphenated.

  4. +++ b/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php
    @@ -70,7 +70,7 @@ public function testHandlers() {
    +        // Table is a reserved key for the meta information.
    

    "meta-information" should be hyphenated.

ChrisDarke’s picture

This issue is tagged for first time contributors at DrupalCon Prague 2022.

Ratan Priya’s picture

Assigned: Unassigned » Ratan Priya
Ratan Priya’s picture

Assigned: Ratan Priya » Unassigned
Status: Needs work » Needs review
FileSize
13.88 KB
2.9 KB

@xjm,
Made changes as per comment #36.
Needs review.

volkswagenchick’s picture

Hi 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.

petu’s picture

I would try to work with this issue at DrupalCon Prague.

mdwornicki’s picture

@petu how far did you get with this issue. I'm novice and would like to join and work together on this issue

petu’s picture

Hi @hayburner,

no valuable progress so far.

Version: 9.5.x-dev » 10.1.x-dev

Drupal 9.5.0-beta2 and Drupal 10.0.0-beta2 were released on September 29, 2022, which means new developments and disruptive changes should now be targeted for the 10.1.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

quietone’s picture

Issue tags: +cspell error

Adding tag for the cspell spelling error issues.

longwave’s picture

Status: Needs review » Needs work
Issue tags: +Needs reroll

Latest patches do not apply.

Medha Kumari’s picture

Version: 10.1.x-dev » 9.5.x-dev
Issue tags: -Needs reroll
FileSize
13.85 KB
6.58 KB

Rerolled patch #39 in 9.5.x .

Nikhil_110’s picture

Status: Needs work » Needs review
FileSize
13.77 KB

I have uploaded the patch against 9.5.x - Please review

Manoj Raj.R’s picture

#36 is in the latest patch i hope with cspell error/ignore

Akram Khan’s picture

Status: Needs review » Reviewed & tested by the community
FileSize
172.06 KB
195.76 KB

Tested Patch #48 against 9.5.x and its applied successfully and dictionary.txt file changed after applying patch.

alexpott’s picture

Status: Reviewed & tested by the community » Needs work

We need a 10.x version of the patch too. Unfortunately the 9.5.x patch does not apply there.

Akram Khan’s picture

Version: 9.5.x-dev » 10.0.x-dev
FileSize
13.18 KB

Created patch for 10.0.x by considering the comment of #51

Akram Khan’s picture

Updated patch as per to PHPCS

Akram Khan’s picture

Status: Needs work » Needs review
Roshni_K’s picture

Assigned: Unassigned » Roshni_K
Roshni_K’s picture

Assigned: Roshni_K » Unassigned
Status: Needs review » Needs work

Tested the patch from #53 for version 10.0.x .Patch is not applying and showing below error

error: patch failed: core/misc/cspell/dictionary.txt:656
error: core/misc/cspell/dictionary.txt: patch does not apply

ravi.shankar’s picture

Status: Needs work » Needs review

Thanks @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.

Roshni_K’s picture

Tested 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.

Roshni_K’s picture

Assigned: Unassigned » Roshni_K
longwave’s picture

Status: Needs review » Needs work

We seem to have lost the changes suggested in #36. Some more notes:

  1. +++ b/core/lib/Drupal/Component/Utility/Unicode.php
    @@ -2,6 +2,7 @@
    +// cspell:ignore myverylongurl myverylongurlexample
    

    Here we could use MyVeryLongURL and MyVeryLongURLExample in the docs instead of ignoring the words?

  2. +++ b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
    @@ -737,7 +737,7 @@ public function testUrlFilter() {
    -      HTML www.example21.com soup by person@example22.com can litererally http://www.example23.com contain *img*<img> anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com.
    +        HTML www.example21.com soup by person@example22.com can literally http://www.example23.com contain *img*<img> anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com.
    

    The indentation has been changed here, it is now misaligned compared to the other text.

longwave’s picture

@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.

lucienchalom’s picture

Assigned: Roshni_K » Unassigned
Status: Needs work » Needs review
FileSize
13.3 KB
5.75 KB

had 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

Status: Needs review » Needs work

The last submitted patch, 62: 3219475-62.patch, failed testing. View results

Prem Suthar’s picture

Try TO Fix The Failed #62 Patch.

Kaushik1216 made their first commit to this issue’s fork.

adeshsharma’s picture

Assigned: Unassigned » adeshsharma
adeshsharma’s picture

Assigned: adeshsharma » Unassigned
Status: Needs work » Needs review
FileSize
14.22 KB
2.34 KB
smustgrave’s picture

Status: Needs review » Needs work
Issue tags: +Needs Review Queue Initiative, +Needs reroll

Cleaning 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.

adeshsharma’s picture

Status: Needs work » Needs review
FileSize
14.24 KB
2.97 KB

Addressed the fixes in comment #62 in my patch.

smustgrave’s picture

Status: Needs review » Needs work

CC 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.

rpayanm made their first commit to this issue’s fork.

adeshsharma’s picture

Status: Needs work » Needs review
FileSize
14.24 KB
687 bytes

Addressed all issues including #62.

adeshsharma’s picture

Checking to see if "…" character got fixed in my last patch. Includes suggestions from #62.

smustgrave’s picture

Status: Needs review » Needs work
Issue tags: -Needs reroll

Not 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?

adeshsharma’s picture

needs-review-queue-bot’s picture

Status: Needs review » Needs work
FileSize
85 bytes

The 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.

Prem Suthar’s picture

Fix The Failed Patch #76.
also, Add The Interdiff FOr 76-78.

lucienchalom’s picture

Reading 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?

smustgrave’s picture

Version: 10.0.x-dev » 11.x-dev
Status: Needs review » Reviewed & tested by the community

Cleaning 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.

longwave’s picture

Status: Reviewed & tested by the community » Needs work
Issue tags: +Needs reroll

#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.

quietone’s picture

Issue summary: View changes
Status: Needs work » Needs review
Issue tags: -Needs reroll
FileSize
3.52 KB
13.2 KB

I 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.

smustgrave’s picture

Status: Needs review » Reviewed & tested by the community

Reroll looks good.

  • longwave committed 235b1393 on 10.1.x
    Issue #3219475 by quietone, adeshsharma, ravi.shankar, lucienchalom,...

  • longwave committed 1bb050ca on 11.x
    Issue #3219475 by quietone, adeshsharma, ravi.shankar, lucienchalom,...
longwave’s picture

Status: Reviewed & tested by the community » Fixed

Thanks 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.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.

alexpott’s picture

Unfortunately 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