aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/form-validators/user-validators.ts2
-rw-r--r--client/src/app/shared/shared-main/users/user-notifications.component.html2
-rw-r--r--client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts12
3 files changed, 8 insertions, 8 deletions
diff --git a/client/src/app/shared/form-validators/user-validators.ts b/client/src/app/shared/form-validators/user-validators.ts
index 18199505c..9efc5180d 100644
--- a/client/src/app/shared/form-validators/user-validators.ts
+++ b/client/src/app/shared/form-validators/user-validators.ts
@@ -27,7 +27,7 @@ export const USER_CHANNEL_NAME_VALIDATOR: BuildFormValidator = {
27 'required': $localize`Channel name is required.`, 27 'required': $localize`Channel name is required.`,
28 'minlength': $localize`Channel name must be at least 1 character long.`, 28 'minlength': $localize`Channel name must be at least 1 character long.`,
29 'maxlength': $localize`Channel name cannot be more than 50 characters long.`, 29 'maxlength': $localize`Channel name cannot be more than 50 characters long.`,
30 'pattern': $localize`Channel name should be lowercase alphanumeric; dots and underscores are allowed.` 30 'pattern': $localize`Channel name should be lowercase, and can contain only alphanumeric characters, dots and underscores.`
31 } 31 }
32} 32}
33 33
diff --git a/client/src/app/shared/shared-main/users/user-notifications.component.html b/client/src/app/shared/shared-main/users/user-notifications.component.html
index a56a0859b..91a4c8dc3 100644
--- a/client/src/app/shared/shared-main/users/user-notifications.component.html
+++ b/client/src/app/shared/shared-main/users/user-notifications.component.html
@@ -187,7 +187,7 @@
187 <my-global-icon iconName="alert" aria-hidden="true"></my-global-icon> 187 <my-global-icon iconName="alert" aria-hidden="true"></my-global-icon>
188 188
189 <div class="message" i18n> 189 <div class="message" i18n>
190 The notification points to a content now unavailable 190 The notification points to content now unavailable
191 </div> 191 </div>
192 </ng-container> 192 </ng-container>
193 </ng-container> 193 </ng-container>
diff --git a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
index 44aefa853..f59910d1c 100644
--- a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
+++ b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
@@ -295,7 +295,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
295 this.userActions.push([ 295 this.userActions.push([
296 { 296 {
297 label: $localize`Mute this account`, 297 label: $localize`Mute this account`,
298 description: $localize`Hide any content from that user for you.`, 298 description: $localize`Hide any content from that user from you.`,
299 isDisplayed: ({ account }) => account.mutedByUser === false, 299 isDisplayed: ({ account }) => account.mutedByUser === false,
300 handler: ({ account }) => this.blockAccountByUser(account) 300 handler: ({ account }) => this.blockAccountByUser(account)
301 }, 301 },
@@ -319,7 +319,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
319 }, 319 },
320 { 320 {
321 label: $localize`Remove comments from your videos`, 321 label: $localize`Remove comments from your videos`,
322 description: $localize`Remove comments of this account from your videos.`, 322 description: $localize`Remove comments made by this account on your videos.`,
323 handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'my-videos' }) 323 handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'my-videos' })
324 } 324 }
325 ]) 325 ])
@@ -331,13 +331,13 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
331 instanceActions = instanceActions.concat([ 331 instanceActions = instanceActions.concat([
332 { 332 {
333 label: $localize`Mute this account by your instance`, 333 label: $localize`Mute this account by your instance`,
334 description: $localize`Hide any content from that user for you, your instance and its users.`, 334 description: $localize`Hide any content from that user from you, your instance and its users.`,
335 isDisplayed: ({ account }) => account.mutedByInstance === false, 335 isDisplayed: ({ account }) => account.mutedByInstance === false,
336 handler: ({ account }) => this.blockAccountByInstance(account) 336 handler: ({ account }) => this.blockAccountByInstance(account)
337 }, 337 },
338 { 338 {
339 label: $localize`Unmute this account by your instance`, 339 label: $localize`Unmute this account by your instance`,
340 description: $localize`Show back content from that user for you, your instance and its users.`, 340 description: $localize`Show this user's content to the users of this instance again.`,
341 isDisplayed: ({ account }) => account.mutedByInstance === true, 341 isDisplayed: ({ account }) => account.mutedByInstance === true,
342 handler: ({ account }) => this.unblockAccountByInstance(account) 342 handler: ({ account }) => this.unblockAccountByInstance(account)
343 } 343 }
@@ -349,7 +349,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
349 instanceActions = instanceActions.concat([ 349 instanceActions = instanceActions.concat([
350 { 350 {
351 label: $localize`Mute the instance by your instance`, 351 label: $localize`Mute the instance by your instance`,
352 description: $localize`Hide any content from that instance for you, your instance and its users.`, 352 description: $localize`Hide any content from that instance from you, your instance and its users.`,
353 isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false, 353 isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false,
354 handler: ({ account }) => this.blockServerByInstance(account.host) 354 handler: ({ account }) => this.blockServerByInstance(account.host)
355 }, 355 },
@@ -366,7 +366,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
366 instanceActions = instanceActions.concat([ 366 instanceActions = instanceActions.concat([
367 { 367 {
368 label: $localize`Remove comments from your instance`, 368 label: $localize`Remove comments from your instance`,
369 description: $localize`Remove comments of this account from your instance.`, 369 description: $localize`Remove comments made by this account from your instance.`,
370 handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'instance' }) 370 handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'instance' })
371 } 371 }
372 ]) 372 ])