Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Convert all spelling to Google English #2138

Merged
merged 11 commits into from
Mar 29, 2019
Merged

Convert all spelling to Google English #2138

merged 11 commits into from
Mar 29, 2019

Conversation

joepetrowski
Copy link
Contributor

Fixes #1768

The only remaining thing to change is a crate in libp2p called behaviour.

@parity-cla-bot

This comment has been minimized.

1 similar comment
@parity-cla-bot
Copy link

It looks like @joepetrowski signed our Contributor License Agreement. 👍

Many thanks,

Parity Technologies CLA Bot

@shawntabrizi
Copy link
Member

shawntabrizi commented Mar 28, 2019

Ran a script across all the files and found these too. You should be able to cherry pick commits if you don't like any of the changes I introduced

Still missing:

  • behaviour to behavior
  • colour to color

Due to downstream dependencies

@joepetrowski
Copy link
Contributor Author

joepetrowski commented Mar 29, 2019

Councillor is still used more in US English.

Same with marshal

cancelled/canceled is basically a tie

That's why I didn't do those three. Good catches on the others, I will handle rollback and update.

@joepetrowski
Copy link
Contributor Author

My search for colour comes up empty, where do you see it? Behaviour I mentioned in my comment, will need to update libp2p.

parity@eta ~/p/s/substrate> grep -rnIe 'colour'
parity@eta ~/p/s/substrate> 

@gavofyork
Copy link
Member

Indeed. Some of those changes will need rolling back.

We use:

I would basically go with the most common spelling on google for everything. "Google English".

@gavofyork
Copy link
Member

Otherwise, it looks good.

core/rpc/src/chain/mod.rs Outdated Show resolved Hide resolved
@shawntabrizi
Copy link
Member

@joepetrowski you can find Colour in two files:
https://github.com/paritytech/substrate/blob/master/core/cli/src/informant.rs#L19
https://github.com/paritytech/substrate/blob/master/core/cli/src/lib.rs#L714

Again, these are part of an external crate, so not much we can do, but just an FYI

@gavofyork gavofyork added this to the 1.0 milestone Mar 29, 2019
@gavofyork gavofyork added the A0-please_review Pull request needs code review. label Mar 29, 2019
core/rpc/src/chain/mod.rs Outdated Show resolved Hide resolved
@@ -81,19 +81,19 @@ pub trait ChainApi<Number, Hash, Header, SignedBlock> {

/// New head subscription
#[pubsub(
subscription = "chain_finalisedHead",
subscription = "chain_finalizedHead",
Copy link
Contributor

Choose a reason for hiding this comment

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

However, we don't support aliases for subscription names, so this has to use the new name despite being subscribed via alias.

@gavofyork gavofyork merged commit 8bf08ca into master Mar 29, 2019
@gavofyork gavofyork deleted the joe-uk2us branch March 29, 2019 13:11
@gavofyork gavofyork changed the title Convert all UK spelling to US Convert all spelling to Google English Apr 1, 2019
MTDK1 pushed a commit to bdevux/substrate that referenced this pull request Apr 12, 2019
* all the ise

* forgot a misspelling

* a few more replacements

* bump impl

* rollback and fixes

* bump impl again

* Add aliases for RPC

* Update on_demand.rs
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-please_review Pull request needs code review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants