fix a few typos (#2141)

* fix a few typos

* apply changes to original files instead

* additional correction

diff --git a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
index 3f79efe20237493ca0f2d37726d2895d1d296e0b..41021c59295e52209f9c85ba945b65f07d774010 100644 (file)
--- a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
@@ -24,7 +24,7 @@ export class MyAccountDangerZoneComponent {
 
   async deleteMe () {
     const res = await this.confirmService.confirmWithInput(
-      this.i18n('Are you sure you want to delete your account? This will delete all you data, including channels, videos etc.'),
+      this.i18n('Are you sure you want to delete your account? This will delete all your data, including channels, videos etc.'),
       this.i18n('Type your username to confirm'),
       this.user.username,
       this.i18n('Delete your account'),

diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 6833559600feefd0fe26165231136246a4d5a108..3fb1247c842eb764b851c37a701c552c78a56d6a 100644 (file)
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -63,7 +63,7 @@
   <div class="modal-body">
 
     <div *ngIf="isEmailDisabled()" class="alert alert-danger" i18n>
-      We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system.
+      We are sorry, you cannot recover your password because your instance administrator did not configure the PeerTube email system.
     </div>
 
     <div class="form-group" [hidden]="isEmailDisabled()">

diff --git a/client/src/app/shared/forms/form-validators/user-validators.service.ts b/client/src/app/shared/forms/form-validators/user-validators.service.ts
index 2dafb1816c382f0f0fa1eb270622a0dddc94ed34..4dff3e422067f0720635bafd26c1786e7bf02bc6 100644 (file)
--- a/client/src/app/shared/forms/form-validators/user-validators.service.ts
+++ b/client/src/app/shared/forms/form-validators/user-validators.service.ts
@@ -103,7 +103,7 @@ export class UserValidatorsService {
         Validators.requiredTrue
       ],
       MESSAGES: {
-        'required': this.i18n('You must to agree with the instance terms in order to registering on it.')
+        'required': this.i18n('You must agree with the instance terms in order to register on it.')
       }
     }
 

diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
index 916f5d0ff478df10d227ebfb57e5200c6f8ff43b..cce8455e02edd0c0d3e4699326aa289df6ac719e 100644 (file)
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
@@ -34,7 +34,7 @@
     </span>
     <span class="btn btn-sm mx-3" role="button" (click)="gotoLogin()" i18n>login to comment</span>
     <span i18n>
-      Otherwise you can comment using an account on any ActivityPub-compatible instance.
+      Otherwise, you can comment using an account on any ActivityPub-compatible instance.
       On most platforms, you can find the video by typing its URL in the search bar and then comment it
       from within the software's interface.
     </span>

diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
index a3e5ed880c9021df7cdec3c9ac466be8d6c8be78..57b98afceb99c0ae9e542c92d0c4eeb99afda6b6 100644 (file)
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
@@ -158,7 +158,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
     }
 
     if (commentToDelete.isLocal) {
-      message += this.i18n(' The deletion will be sent to remote instances so they remove the comment too.')
+      message += this.i18n(' The deletion will be sent to remote instances, so they remove the comment too.')
     } else {
       message += this.i18n(' It is a remote comment, so the deletion will only be effective on your instance.')
     }

diff --git a/server/lib/job-queue/handlers/activitypub-follow.ts b/server/lib/job-queue/handlers/activitypub-follow.ts
index af7c8a8383afe42bcdcadb7e6e56242f1dcb745b..4a7cda0a2ba74e216b3d76aa1a769833f604e884 100644 (file)
--- 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 544db76d73c805b124246d42c01910baca9ba80d..871233afe52d35dd2c9d550a5a38caf696cf00b6 100644 (file)
--- 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 55094795c459ac94887157fbd8f0487c13474d64..9d7ff898463fd80c76fc8d303eeb4fccd7aea9b2 100644 (file)
--- 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 6b94d74e503514a5e6efadaf0c5186311e919d96..e86df3bfc97e3f054373359a25ff4babd10eef58 100644 (file)
--- 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
 

diff --git a/support/doc/plugins/guide.md b/support/doc/plugins/guide.md
index b4f3e66381727091ca7a03e3dd5415164202dd1b..8e720e94b1f3ac6a168f92bafc423ea3fa425d35 100644 (file)
--- a/support/doc/plugins/guide.md
+++ b/support/doc/plugins/guide.md
@@ -36,7 +36,7 @@
 
 ## Concepts
 
-Themes are exactly the same than plugins, except that:
+Themes are exactly the same as plugins, except that:
  * Their name starts with `peertube-theme-` instead of `peertube-plugin-`
  * They cannot declare server code (so they cannot register server hooks or settings)
  * CSS files are loaded by client only if the theme is chosen by the administrator or the user