aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts2
-rw-r--r--client/src/app/login/login.component.html2
-rw-r--r--client/src/app/shared/forms/form-validators/user-validators.service.ts2
-rw-r--r--client/src/app/videos/+video-watch/comment/video-comment-add.component.html2
-rw-r--r--client/src/app/videos/+video-watch/comment/video-comments.component.ts2
-rw-r--r--server/lib/job-queue/handlers/activitypub-follow.ts2
-rw-r--r--server/middlewares/validators/users.ts2
-rw-r--r--server/tests/api/check-params/users.ts2
-rw-r--r--server/tools/README.md2
-rw-r--r--support/doc/plugins/guide.md2
10 files changed, 10 insertions, 10 deletions
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 3f79efe20..41021c592 100644
--- 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 {
24 24
25 async deleteMe () { 25 async deleteMe () {
26 const res = await this.confirmService.confirmWithInput( 26 const res = await this.confirmService.confirmWithInput(
27 this.i18n('Are you sure you want to delete your account? This will delete all you data, including channels, videos etc.'), 27 this.i18n('Are you sure you want to delete your account? This will delete all your data, including channels, videos etc.'),
28 this.i18n('Type your username to confirm'), 28 this.i18n('Type your username to confirm'),
29 this.user.username, 29 this.user.username,
30 this.i18n('Delete your account'), 30 this.i18n('Delete your account'),
diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 683355960..3fb1247c8 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -63,7 +63,7 @@
63 <div class="modal-body"> 63 <div class="modal-body">
64 64
65 <div *ngIf="isEmailDisabled()" class="alert alert-danger" i18n> 65 <div *ngIf="isEmailDisabled()" class="alert alert-danger" i18n>
66 We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system. 66 We are sorry, you cannot recover your password because your instance administrator did not configure the PeerTube email system.
67 </div> 67 </div>
68 68
69 <div class="form-group" [hidden]="isEmailDisabled()"> 69 <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 2dafb1816..4dff3e422 100644
--- 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 {
103 Validators.requiredTrue 103 Validators.requiredTrue
104 ], 104 ],
105 MESSAGES: { 105 MESSAGES: {
106 'required': this.i18n('You must to agree with the instance terms in order to registering on it.') 106 'required': this.i18n('You must agree with the instance terms in order to register on it.')
107 } 107 }
108 } 108 }
109 109
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 916f5d0ff..cce8455e0 100644
--- 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 @@
34 </span> 34 </span>
35 <span class="btn btn-sm mx-3" role="button" (click)="gotoLogin()" i18n>login to comment</span> 35 <span class="btn btn-sm mx-3" role="button" (click)="gotoLogin()" i18n>login to comment</span>
36 <span i18n> 36 <span i18n>
37 Otherwise you can comment using an account on any ActivityPub-compatible instance. 37 Otherwise, you can comment using an account on any ActivityPub-compatible instance.
38 On most platforms, you can find the video by typing its URL in the search bar and then comment it 38 On most platforms, you can find the video by typing its URL in the search bar and then comment it
39 from within the software's interface. 39 from within the software's interface.
40 </span> 40 </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 a3e5ed880..57b98afce 100644
--- 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 {
158 } 158 }
159 159
160 if (commentToDelete.isLocal) { 160 if (commentToDelete.isLocal) {
161 message += this.i18n(' The deletion will be sent to remote instances so they remove the comment too.') 161 message += this.i18n(' The deletion will be sent to remote instances, so they remove the comment too.')
162 } else { 162 } else {
163 message += this.i18n(' It is a remote comment, so the deletion will only be effective on your instance.') 163 message += this.i18n(' It is a remote comment, so the deletion will only be effective on your instance.')
164 } 164 }
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 {
48 48
49async function follow (fromActor: MActor, targetActor: MActorFull, isAutoFollow = false) { 49async function follow (fromActor: MActor, targetActor: MActorFull, isAutoFollow = false) {
50 if (fromActor.id === targetActor.id) { 50 if (fromActor.id === targetActor.id) {
51 throw new Error('Follower is the same than target actor.') 51 throw new Error('Follower is the same as target actor.')
52 } 52 }
53 53
54 // Same server, direct accept 54 // 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 = [
91 91
92 if (body.channel.name === body.username) { 92 if (body.channel.name === body.username) {
93 return res.status(400) 93 return res.status(400)
94 .json({ error: 'Channel name cannot be the same than user username.' }) 94 .json({ error: 'Channel name cannot be the same as user username.' })
95 } 95 }
96 96
97 const existing = await ActorModel.loadLocalByName(body.channel.name) 97 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 () {
901 await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) 901 await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields })
902 }) 902 })
903 903
904 it('Should fail with a channel name that is the same than user username', async function () { 904 it('Should fail with a channel name that is the same as username', async function () {
905 const source = { username: 'super_user', channel: { name: 'super_user', displayName: 'display name' } } 905 const source = { username: 'super_user', channel: { name: 'super_user', displayName: 'display name' } }
906 const fields = immutableAssign(baseCorrectParams, source) 906 const fields = immutableAssign(baseCorrectParams, source)
907 907
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
18 18
19Unless 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. 19Unless 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.
20 20
21`auth [action]`: stores credentials for your accounts on remote instances so that you don't need to pass them at every command 21`auth [action]`: stores credentials for your accounts on remote instances, so that you don't need to pass them at every command
22 22
23`upload|up`: upload a video to a remote instance 23`upload|up`: upload a video to a remote instance
24 24
diff --git a/support/doc/plugins/guide.md b/support/doc/plugins/guide.md
index b4f3e6638..8e720e94b 100644
--- a/support/doc/plugins/guide.md
+++ b/support/doc/plugins/guide.md
@@ -36,7 +36,7 @@
36 36
37## Concepts 37## Concepts
38 38
39Themes are exactly the same than plugins, except that: 39Themes are exactly the same as plugins, except that:
40 * Their name starts with `peertube-theme-` instead of `peertube-plugin-` 40 * Their name starts with `peertube-theme-` instead of `peertube-plugin-`
41 * They cannot declare server code (so they cannot register server hooks or settings) 41 * They cannot declare server code (so they cannot register server hooks or settings)
42 * CSS files are loaded by client only if the theme is chosen by the administrator or the user 42 * CSS files are loaded by client only if the theme is chosen by the administrator or the user