More conversions from enGB to enUS (after #1485) by sebweb3r · Pull Request #1626 · codespell-project/codespell

sebweb3r · 2020-08-11T21:27:19Z

The words are in dictionary, but #1485 is needed.

sebweb3r · 2020-08-11T21:28:28Z

lurch · 2020-08-31T01:15:42Z

 customised->customized
 customising->customizing
+daemonisation->daemonization
+daemonisation->demonization


Was the left-side supposed to be demonisation ?

This conversion is already moved to #1653. I just messed up.
All corrections here wait for a custom aspell dictionary to pass the tests.

I was more referring to the fact that you have two lines with daemonisation on the left side.

Yes. You were right, it was supposed to be demonisation. but I moved the words, that are in aspell to #1653.
I deleted the duplicate entry now. :-)

lurch · 2020-08-31T01:33:26Z

I guess even after the addition of #1485 , words like "daemonisation" will still cause problems? http://app.aspell.net/lookup?dict=en_GB-large&words=daemonisation

lurch · 2020-08-31T02:21:10Z

Sorry for dumping so many comments on your PR, let me know if you'd like me to add them to #1666 instead!

sebweb3r · 2020-08-31T07:51:20Z

No problem. I added them to a new MR myself, because I have read this to late.

Yes, no, maybe. I'm not sure, which custom dictionary Peter wants to use. But it for sure, that it has to wait atleast until then.

lurch · 2020-09-02T23:52:30Z

@sebweb3r Can you please add these words to this PR?

customiser->customizer
digitiser->digitizer
reinitialisation->reinitialization
reinitialises->reinitializes
reinitialising->reinitializing
virtualise->virtualize
virtualised->virtualized
virtualises->virtualizes
virtualising->virtualizing

I had to strip them out of #1666 and it probably makes sense to bundle them into this PR, rather than having another "after #1485" PR 😉

bl-ue · 2021-06-12T15:34:33Z

I'll fix the conflicts.

This reverts commit ffb5244.

bl-ue · 2021-06-12T15:59:36Z

Conflicts fixed 👍🏻

bl-ue · 2021-06-12T16:00:12Z

Ping @lurch: LGTY?

lurch · 2021-06-13T09:29:29Z

Looks okay to me, apart from the failing CI checks 😉

sort: codespell_lib/data/dictionary_en-GB_to_en-US.txt:21: disorder: authorise->authorize
make: *** [Makefile:20: check-dictionaries] Error 1
Dictionary codespell_lib/data/dictionary_en-GB_to_en-US.txt not sorted. Sort with 'make sort-dictionaries'
Error: Process completed with exit code 2.

bl-ue · 2021-06-13T11:49:25Z

Oh darn, I always need to do that after I fix the conflicts 😆

bl-ue · 2021-06-13T12:17:14Z

Ouch, there are a lot of errors 🤔

E error 'authoriser' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'customiser' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'daemonisation' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'daemonise' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'daemonised' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'daemonises' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'deinitialise' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'devirtualisation' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'devirtualise' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'devirtualised' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'digitiser' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'initialisations' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'initialiser' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'initialisers' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'linearisation' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'linearisations' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'parametrised' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'paravirtualisation' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'paravirtualise' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'paravirtualised' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'polariser' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'regulariser' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'reinitialisation' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'reinitialises' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'reinitialising' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'standardiser' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'summarisation' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'templatised' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'uninitialise' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'uninitialises' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'unsynchronised' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'virtualise' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'virtualised' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'virtualises' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt
E error 'virtualising' should be in aspell dictionaries (en_GB) for dictionary /home/runner/work/codespell/codespell/codespell_lib/tests/../data/dictionary_en-GB_to_en-US.txt

any ideas @lurch?

lurch · 2021-06-13T13:23:04Z

I think that might be the "after #1485" part of this PR, i.e. #1485 needs to be merged, before this PR can be merged?
But that kinda goes beyond my knowledge of how codespell works. ping @peternewman

peternewman added the dictionary Changes to the dictionary label Aug 12, 2020

sebweb3r force-pushed the enUS_aspell branch from 378c360 to b9f270dCompare August 12, 2020 21:58

sebweb3r mentioned this pull request Aug 30, 2020
Dictionary questions #1660
Open

lurch reviewed Aug 31, 2020
View reviewed changes

Comment threadcodespell_lib/data/dictionary_en-GB_to_en-US.txt

lurch reviewed Aug 31, 2020
View reviewed changes

Comment threadcodespell_lib/data/dictionary_en-GB_to_en-US.txt

lurch reviewed Aug 31, 2020
View reviewed changes

Comment threadcodespell_lib/data/dictionary_en-GB_to_en-US.txt

sebweb3r mentioned this pull request Aug 31, 2020
add conversions for demon* from enGB to enUS #1653
Merged

sebweb3r mentioned this pull request Sep 21, 2020
Add a few more en_GB -> en_US suggestions #1666
Merged

lurch mentioned this pull request Sep 23, 2020
Add tests for aspell dictionaries different from 'en' #1690
Merged

bl-ue suggested changes Jun 12, 2021
View reviewed changes

Comment threadcodespell_lib/data/dictionary_en-GB_to_en-US.txt

bl-ue self-assigned this Jun 12, 2021

sebweb3rand others added 7 commits June 12, 2021 11:57

Revert "Deleted entries, that are not in aspell"
2ddb8b5
This reverts commit ffb5244.

Add demonisation
9d67638

Delete duplicate of typo
578e985

Add suggestions of@lurch
e984056

Dict: Add authoriser by@lurch
67ab845

Dict: Add polariser
2acf06d

Dict: Add programme->program
a102096

bl-ue force-pushed the enUS_aspell branch from ad5aa7c to a102096Compare June 12, 2021 15:59

Update codespell_lib/data/dictionary_en-GB_to_en-US.txt
c7fce97

bl-ue approved these changes Jun 12, 2021
View reviewed changes

Sort dicts
cda466a

bl-ue enabled auto-merge (squash) June 13, 2021 12:15

Uh oh!

Conversation

sebweb3r commented Aug 11, 2020

Uh oh!

sebweb3r commented Aug 11, 2020

Uh oh!

lurchAug 31, 2020

Choose a reason for hiding this comment

Uh oh!

sebweb3rAug 31, 2020

Choose a reason for hiding this comment

Uh oh!

lurchAug 31, 2020

Choose a reason for hiding this comment

Uh oh!

sebweb3rAug 31, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lurch commented Aug 31, 2020

Uh oh!

lurch commented Aug 31, 2020

Uh oh!

sebweb3r commented Aug 31, 2020

Uh oh!

lurch commented Sep 2, 2020

Uh oh!

Uh oh!

bl-ue commented Jun 12, 2021

Uh oh!

bl-ue commented Jun 12, 2021

Uh oh!

bl-ue commented Jun 12, 2021

Uh oh!

lurch commented Jun 13, 2021

Uh oh!

bl-ue commented Jun 13, 2021

Uh oh!

bl-ue commented Jun 13, 2021

Uh oh!

lurch commented Jun 13, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants