From 92ea70a782181b987b3547a0d5816e314efb5112 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 16 Oct 2018 11:51:28 +0200
Subject: Fix code typos
---
.../instance-blocklist/instance-server-blocklist.component.html | 2 +-
.../instance-blocklist/instance-server-blocklist.component.ts | 4 ++--
client/src/app/+admin/moderation/moderation.component.html | 4 ++--
client/src/app/+admin/moderation/moderation.component.ts | 4 ++--
.../my-account-blocklist/my-account-server-blocklist.component.html | 2 +-
.../my-account-blocklist/my-account-server-blocklist.component.ts | 4 ++--
client/src/app/+my-account/my-account-routing.module.ts | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
(limited to 'client/src')
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html
index 859c0f916..f634ba834 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html
@@ -1,5 +1,5 @@
<p-table
- [value]="blockedAccounts" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
+ [value]="blockedServers" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
[sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)"
>
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
index 9459117a3..130009dc7 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
@@ -12,7 +12,7 @@ import { ServerBlock } from '../../../../../../shared'
templateUrl: './instance-server-blocklist.component.html'
})
export class InstanceServerBlocklistComponent extends RestTable implements OnInit {
- blockedAccounts: ServerBlock[] = []
+ blockedServers: ServerBlock[] = []
totalRecords = 0
rowsPerPage = 10
sort: SortMeta = { field: 'createdAt', order: -1 }
@@ -50,7 +50,7 @@ export class InstanceServerBlocklistComponent extends RestTable implements OnIni
return this.blocklistService.getInstanceServerBlocklist(this.pagination, this.sort)
.subscribe(
resultList => {
- this.blockedAccounts = resultList.data
+ this.blockedServers = resultList.data
this.totalRecords = resultList.total
},
diff --git a/client/src/app/+admin/moderation/moderation.component.html b/client/src/app/+admin/moderation/moderation.component.html
index 8ec7278ef..01457936c 100644
--- a/client/src/app/+admin/moderation/moderation.component.html
+++ b/client/src/app/+admin/moderation/moderation.component.html
@@ -6,9 +6,9 @@
<a *ngIf="hasVideoBlacklistRight()" i18n routerLink="video-blacklist/list" routerLinkActive="active">Blacklisted videos</a>
- <a *ngIf="hasAccountsBlacklistRight()" i18n routerLink="blocklist/accounts" routerLinkActive="active">Muted accounts</a>
+ <a *ngIf="hasAccountsBlocklistRight()" i18n routerLink="blocklist/accounts" routerLinkActive="active">Muted accounts</a>
- <a *ngIf="hasServersBlacklistRight()" i18n routerLink="blocklist/servers" routerLinkActive="active">Muted servers</a>
+ <a *ngIf="hasServersBlocklistRight()" i18n routerLink="blocklist/servers" routerLinkActive="active">Muted servers</a>
</div>
</div>
diff --git a/client/src/app/+admin/moderation/moderation.component.ts b/client/src/app/+admin/moderation/moderation.component.ts
index 7f85f920e..2b2618933 100644
--- a/client/src/app/+admin/moderation/moderation.component.ts
+++ b/client/src/app/+admin/moderation/moderation.component.ts
@@ -17,11 +17,11 @@ export class ModerationComponent {
return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
}
- hasAccountsBlacklistRight () {
+ hasAccountsBlocklistRight () {
return this.auth.getUser().hasRight(UserRight.MANAGE_ACCOUNTS_BLOCKLIST)
}
- hasServersBlacklistRight () {
+ hasServersBlocklistRight () {
return this.auth.getUser().hasRight(UserRight.MANAGE_SERVERS_BLOCKLIST)
}
}
diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html
index 680334740..329cfb08f 100644
--- a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html
+++ b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html
@@ -3,7 +3,7 @@
</div>
<p-table
- [value]="blockedAccounts" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
+ [value]="blockedServers" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
[sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)"
>
diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
index b994c2c99..b411d6926 100644
--- a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
+++ b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
@@ -12,7 +12,7 @@ import { BlocklistService } from '@app/shared/blocklist'
templateUrl: './my-account-server-blocklist.component.html'
})
export class MyAccountServerBlocklistComponent extends RestTable implements OnInit {
- blockedAccounts: ServerBlock[] = []
+ blockedServers: ServerBlock[] = []
totalRecords = 0
rowsPerPage = 10
sort: SortMeta = { field: 'createdAt', order: -1 }
@@ -50,7 +50,7 @@ export class MyAccountServerBlocklistComponent extends RestTable implements OnIn
return this.blocklistService.getUserServerBlocklist(this.pagination, this.sort)
.subscribe(
resultList => {
- this.blockedAccounts = resultList.data
+ this.blockedServers = resultList.data
this.totalRecords = resultList.total
},
diff --git a/client/src/app/+my-account/my-account-routing.module.ts b/client/src/app/+my-account/my-account-routing.module.ts
index 49f9c94a7..601e517b4 100644
--- a/client/src/app/+my-account/my-account-routing.module.ts
+++ b/client/src/app/+my-account/my-account-routing.module.ts
@@ -102,7 +102,7 @@ const myAccountRoutes: Routes = [
component: MyAccountBlocklistComponent,
data: {
meta: {
- title: 'Accounts blocklist'
+ title: 'Muted accounts'
}
}
},
@@ -111,7 +111,7 @@ const myAccountRoutes: Routes = [
component: MyAccountServerBlocklistComponent,
data: {
meta: {
- title: 'Instances blocklist'
+ title: 'Muted instances'
}
}
}
--
cgit v1.2.3