Problem/Motivation

Fix some 'easy' words that are not in tests.

Steps to reproduce

Proposed resolution

  1. differring
  2. favourite
  3. fulldata
  4. languageswitcher
  5. licious
  6. minifyzombies
  7. mocky
  8. newfieldinitial
  9. proname
  10. readmore
  11. somecompany
  12. torder
  13. vampirize

Remaining tasks

User interface changes

Introduced terminology

API changes

Data model changes

Release notes snippet

CommentFileSizeAuthor
#10 3483551-nr-bot.txt90 bytesneeds-review-queue-bot
#8 3483551-nr-bot.txt90 bytesneeds-review-queue-bot

Issue fork drupal-3483551

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:

About issue forks

Comments

quietone created an issue. See original summary.

quietone opened merge request !9959

quietone’s picture

quietone commented
Title: Fix a small collection of words » Fix a dozen words
Issue summary: View changes
Status: Active » Needs review
smustgrave’s picture

smustgrave commented
Title: Fix a dozen words » Fix 13 words
Issue summary: View changes
Status: Needs review » Reviewed & tested by the community

Almost renamed it to unlucky 13. But updated issue as appears 13 words vs 12 were changed.

Reviewing those changes though replacements seem good

longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Status: Reviewed & tested by the community » Needs work

A couple of nits where we could avoid ignoring words.

quietone’s picture

quietone commented
Status: Needs work » Needs review

@longwave, thanks.

I've made changes for the feedback and tests are passing.

smustgrave’s picture

smustgrave commented
Status: Needs review » Reviewed & tested by the community

Feedback appears to be addressed

needs-review-queue-bot’s picture

needs-review-queue-bot commented
Status: Reviewed & tested by the community » Needs work
StatusFileSize
new 3483551-nr-bot.txt90 bytes

The Needs Review Queue Bot tested this issue. It no longer applies to Drupal core. Therefore, this issue status is now "Needs work".

This does not mean that the patch necessarily needs to be re-rolled or the MR rebased. Read the Issue Summary, the issue tags and the latest discussion here to determine what needs to be done.

Consult the Drupal Contributor Guide to find step-by-step guides for working with issues.

quietone’s picture

quietone commented
Status: Needs work » Needs review

Rebase with conflict in node.module because of the conversion of hook_help.

needs-review-queue-bot’s picture

needs-review-queue-bot commented
Status: Needs review » Needs work
StatusFileSize
new 3483551-nr-bot.txt90 bytes

The Needs Review Queue Bot tested this issue. It no longer applies to Drupal core. Therefore, this issue status is now "Needs work".

This does not mean that the patch necessarily needs to be re-rolled or the MR rebased. Read the Issue Summary, the issue tags and the latest discussion here to determine what needs to be done.

Consult the Drupal Contributor Guide to find step-by-step guides for working with issues.

Anonymous’s picture

Anonymous (not verified) commented

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

Anonymous’s picture

Anonymous (not verified) commented

@quietone
I fixed the merge error/conflicts so that the MR becomes mergeable, but as soon as the merge conflicts were resolved, phpstan and PHPCS pipelines are failing. Please take a look

Anonymous’s picture

Anonymous (not verified) commented
Status: Needs work » Needs review
quietone’s picture

quietone commented
Status: Needs review » Needs work

@akulsaxena, thanks for working on this. I looked at the MR and there has been a mistake with the merge. What I noticed is that there shouldn't be any changes to the file node.module, although there could be other mistakes as well.

If it were me I would revert the merge and start over. You may want to read the recommended way to rebase a merge request in Drupal. You can also ask in #contribute in Drupal Slack for help.

Anonymous’s picture

Anonymous (not verified) commented

@quietone
I reverted the changes I made.
The branch is now 81 commits behind source branch and needs a rebase

quietone’s picture

quietone commented

@akulsaxena, thanks. Do you want to do the rebase?

Anonymous’s picture

Anonymous (not verified) commented

@quietone
I'm currently a bit occupied with something and wont be able to get to this right now. It would be great if someone else could take this on and handle the rebase.

quietone’s picture

quietone commented
Status: Needs work » Needs review

@akulsaxena, thanks for letting us know you are busy and for reverting the merge.

Rebased and rebuild the dictionary to confirm it was not changed.

Anonymous’s picture

Anonymous (not verified) commented

@quietone
Thank you for working on the rebase
The rebase seems to work fine, there seem to be no merge conflicts on the MR and all the tests are passing.
It can now be moved to RTBC

nicxvan’s picture

nicxvan commented
Status: Needs review » Reviewed & tested by the community

Looks good, words removed from cspell.

Individual file exceptions were added where necessary.

Anonymous’s picture

Anonymous (not verified) commented

Rebased and cleared the merge conflicts
Solving the Merge conflict caused Sorting error (PHPUnit Test Failure)
Sorted the words in dictionary.txt correctly

Anonymous’s picture

Anonymous (not verified) commented

Pipeline run and passed with no errors or warnings

  • larowlan committed 98b6e3a9 on 11.x 
    Issue #3483551 by quietone, akulsaxena, longwave: Fix 13 words
larowlan’s picture

larowlan
Location 🇦🇺🏝.au GMT+10
commented
Status: Reviewed & tested by the community » Fixed

Committed to 11.x - thanks!

larowlan closed merge request !9959

Status: Fixed » Closed (fixed)

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