From 32d7f2b754b8d20bf44ae2121c79570cbff973c3 Mon Sep 17 00:00:00 2001
From: Lukas Winkler <git@lw1.at>
Date: Mon, 23 Sep 2019 08:17:42 +0200
Subject: fix a few typos (#2141)

* fix a few typos

* apply changes to original files instead

* additional correction
---
 server/lib/job-queue/handlers/activitypub-follow.ts | 2 +-
 server/middlewares/validators/users.ts              | 2 +-
 server/tests/api/check-params/users.ts              | 2 +-
 server/tools/README.md                              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'server')

diff --git a/server/lib/job-queue/handlers/activitypub-follow.ts b/server/lib/job-queue/handlers/activitypub-follow.ts
index af7c8a838..4a7cda0a2 100644
--- a/server/lib/job-queue/handlers/activitypub-follow.ts
+++ b/server/lib/job-queue/handlers/activitypub-follow.ts
@@ -48,7 +48,7 @@ export {
 
 async function follow (fromActor: MActor, targetActor: MActorFull, isAutoFollow = false) {
   if (fromActor.id === targetActor.id) {
-    throw new Error('Follower is the same than target actor.')
+    throw new Error('Follower is the same as target actor.')
   }
 
   // Same server, direct accept
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts
index 544db76d7..871233afe 100644
--- a/server/middlewares/validators/users.ts
+++ b/server/middlewares/validators/users.ts
@@ -91,7 +91,7 @@ const usersRegisterValidator = [
 
       if (body.channel.name === body.username) {
         return res.status(400)
-                  .json({ error: 'Channel name cannot be the same than user username.' })
+                  .json({ error: 'Channel name cannot be the same as user username.' })
       }
 
       const existing = await ActorModel.loadLocalByName(body.channel.name)
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts
index 55094795c..9d7ff8984 100644
--- a/server/tests/api/check-params/users.ts
+++ b/server/tests/api/check-params/users.ts
@@ -901,7 +901,7 @@ describe('Test users API validators', function () {
       await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields })
     })
 
-    it('Should fail with a channel name that is the same than user username', async function () {
+    it('Should fail with a channel name that is the same as username', async function () {
       const source = { username: 'super_user', channel: { name: 'super_user', displayName: 'display name' } }
       const fields = immutableAssign(baseCorrectParams, source)
 
diff --git a/server/tools/README.md b/server/tools/README.md
index 6b94d74e5..e86df3bfc 100644
--- a/server/tools/README.md
+++ b/server/tools/README.md
@@ -18,7 +18,7 @@ COMMANDS
 
 Unless otherwise specified, every command can be queried for its own help or manual by passing its name to the `help` command, or by using the `--help` option.
 
-`auth [action]`: stores credentials for your accounts on remote instances so that you don't need to pass them at every command
+`auth [action]`: stores credentials for your accounts on remote instances, so that you don't need to pass them at every command
 
 `upload|up`: upload a video to a remote instance
 
-- 
cgit v1.2.3