Skip to content

Fix mistakes - #1624

Merged
peternewman merged 36 commits into
codespell-project:masterfrom
sebweb3r:typos
Sep 3, 2020
Merged

Fix mistakes#1624
peternewman merged 36 commits into
codespell-project:masterfrom
sebweb3r:typos

Conversation

@sebweb3r

Copy link
Copy Markdown
Contributor

I had a longer look on the dictionary and found some mistakes.

@sebweb3r

Copy link
Copy Markdown
ContributorAuthor

According to https://en.wiktionary.org/wiki/permuter#English
permuter is a valid word

@sebweb3r

Copy link
Copy Markdown
ContributorAuthor

continueq seems to be used in some linux headers!?

Comment threadcodespell_lib/data/dictionary.txt Outdated
@lurch

Copy link
Copy Markdown
Contributor

Looks like contryie->countryie might also be a mistake? https://www.google.com/search?q=%22countryie%22
Perhaps it should be contryie->country, countries, ?

@peternewmanpeternewman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few comments

Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt
Comment threadcodespell_lib/data/dictionary.txt
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
@vikivivi

Copy link
Copy Markdown
Contributor

@sebweb3r Sorry, not aware of your #1624. Please help by include everything from #1643, so that I can withdraw #1643. Thank you

@sebweb3r

Copy link
Copy Markdown
ContributorAuthor

@sebweb3r Sorry, not aware of your #1624. Please help by include everything from #1643, so that I can withdraw #1643. Thank you

No problem. It is done.

sebweb3r added a commit to sebweb3r/codespell that referenced this pull request Aug 18, 2020
@sebweb3rsebweb3r mentioned this pull request Aug 18, 2020
@sebweb3r

Copy link
Copy Markdown
ContributorAuthor

push @peternewman

Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt

@peternewmanpeternewman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more comments

Comment threadcodespell_lib/data/dictionary.txt
Comment threadcodespell_lib/data/dictionary.txt
Comment threadcodespell_lib/data/dictionary.txt
Comment threadcodespell_lib/data/dictionary.txt
Comment threadcodespell_lib/data/dictionary.txt
Comment threadcodespell_lib/data/dictionary.txt Outdated
@sebweb3r

Copy link
Copy Markdown
ContributorAuthor

should be finished @peternewman

@peternewmanpeternewman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more comments.

Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
@sebweb3r

Copy link
Copy Markdown
ContributorAuthor

push @peternewman

@peternewmanpeternewman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more comments

Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt Outdated
Comment threadcodespell_lib/data/dictionary.txt
@sebweb3r

Copy link
Copy Markdown
ContributorAuthor

@peternewman I rebased the MR. the conflict was in the lines

miniscully->minusculy
miniscully->minusculely
ministery->ministry, minister,

where the ministery line was changed in a different MR.

All now open comments, I would like to handle in a new MR.

@peternewman

Copy link
Copy Markdown
Collaborator

@peternewman I rebased the MR. the conflict was in the lines

miniscully->minusculy
miniscully-> minusculely
ministery->ministry, minister,

where the ministery line was changed in a different MR.

Great thanks, that was possibly in @lurch 's.

All now open comments, I would like to handle in a new MR.

Okay, it's two additions and one change. Can we get the change in her at least, and a new PR open for the additions. Otherwise we've got to remember to do them when you've merged this.

FWIW this is one of the reasons why I often suggest smaller PRs are better, although at least this one isn't as unmanageable as some we've had in the past.

@sebweb3r

Copy link
Copy Markdown
ContributorAuthor

All now open comments, I would like to handle in a new MR.

Okay, it's two additions and one change. Can we get the change in her at least, and a new PR open for the additions. Otherwise we've got to remember to do them when you've merged this.

I added all open comments.

FWIW this is one of the reasons why I often suggest smaller PRs are better, although at least this one isn't as unmanageable as some we've had in the past.

Yeah, I like smaller PRs too. But i thought 25 lines initially is small enough. It exploded a little bit.

@peternewmanpeternewman mentioned this pull request Sep 2, 2020

@peternewmanpeternewman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some additional variants

Comment threadcodespell_lib/data/dictionary.txt
Comment threadcodespell_lib/data/dictionary.txt Outdated
@peternewman

Copy link
Copy Markdown
Collaborator

FWIW this is one of the reasons why I often suggest smaller PRs are better, although at least this one isn't as unmanageable as some we've had in the past.

Yeah, I like smaller PRs too. But i thought 25 lines initially is small enough. It exploded a little bit.

I suspect this got extra attention given it was fixing mistakes. But I'd also generally imagine that if you're touching more than say 10-15 parts of the file it can also explode a bit, as we potentially end up inspecting bits of the data you didn't even change. Whereas if its a handful of base words with a lot of variants each then less of the file overall gets reviewed.

@lurch

lurch commented Sep 2, 2020

Copy link
Copy Markdown
Contributor

... It exploded a little bit.

Sorry about that! 💥 🤣
My eagle-eyes are too good at spotting mistakes 😉 👀 🔍

@peternewmanpeternewman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks for fixing these bugs!

Same thing @lurch , any comments from you?

affinitied->affinitized
affinitied->affinities
affinitized->affinities, affinity,
affinitze->affinitize

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm, if we're offering affinitize as a correction, does it make sense to report affinitized as an error?
https://www.google.com/search?q=affinitize
🤷

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly not then. -ed is more popular in Google Books than -e too! http://app.aspell.net/lookup?dict=en_US-large&words=affinitize

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't find affinitize in an english dictionary. and my german dictionaries/deepl have some really strange suggestions.

So let it in or throw it out?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably allow affinitized too really, or at least not correct it.

Comment threadcodespell_lib/data/dictionary.txt Outdated

@peternewmanpeternewman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @sebweb3r

@peternewman
peternewman merged commit 1f3eee3 into codespell-project:masterSep 3, 2020
@lurch

lurch commented Sep 3, 2020

Copy link
Copy Markdown
Contributor

Woohoo, we finally got there! Well done everyone 👏

@sebweb3r

Copy link
Copy Markdown
ContributorAuthor

🎉

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dictionaryChanges to the dictionary

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@sebweb3r@lurch@vikivivi@peternewman