5 files changed, 20 insertions, 26 deletions

diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
index 379c0443e..200d9415f 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
@@ -1,4 +1,4 @@
-<h1 class="sr-only" i18n>Video channels</h1>
+<h1 class="visually-hidden" i18n>Video channels</h1>
 
 <div class="margin-content">
 
@@ -9,7 +9,7 @@
 
       <div class="channel-avatar-row">
         <my-actor-avatar
-          [channel]="videoChannel"
+          [actor]="videoChannel" actorType="channel"
           [internalHref]="getVideoChannelLink(videoChannel)"
           i18n-title
           title="See this video channel"
@@ -23,10 +23,10 @@
         </h2>
 
         <div class="actor-counters">
-          <div class="followers" i18n>{videoChannel.followersCount, plural, =1 {1 subscriber} other {{{ videoChannel.followersCount }} subscribers}}</div>
+          <div class="followers" i18n>{videoChannel.followersCount, plural, =0 {No subscribers} =1 {1 subscriber} other {{{ videoChannel.followersCount }} subscribers}}</div>
 
           <span class="videos-count" *ngIf="getTotalVideosOf(videoChannel) !== undefined" i18n>
-            {getTotalVideosOf(videoChannel), plural, =1 {1 videos} other {{{ getTotalVideosOf(videoChannel) }} videos}}
+            {getTotalVideosOf(videoChannel), plural, =0 {No videos} =1 {1 video} other {{{ getTotalVideosOf(videoChannel) }} videos}}
           </span>
         </div>
 
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
index 30b8098be..832ddf973 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
@@ -65,7 +65,6 @@
     grid-row: 2;
 
     max-height: 80px;
-    font-size: 16px;
   }
 }
 
@@ -105,7 +104,6 @@ my-subscribe-button {
 
   a {
     color: pvar(--mainColor);
-    font-size: 16px;
     font-weight: $font-semibold;
   }
 }
@@ -126,10 +124,6 @@ my-subscribe-button {
       grid-row: 1 / 4;
     }
 
-    h2 {
-      font-size: 16px;
-    }
-
     .actor-counters {
       margin: 0;
       font-size: 13px;
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html
index 8362e6b7e..226fa8f31 100644
--- a/client/src/app/+accounts/accounts.component.html
+++ b/client/src/app/+accounts/accounts.component.html
@@ -2,7 +2,7 @@
   <div class="account-info">
 
     <div class="account-avatar-row">
-      <my-actor-avatar class="main-avatar" [account]="account"></my-actor-avatar>
+      <my-actor-avatar class="main-avatar" actorType="account" [actor]="account"></my-actor-avatar>
 
       <div>
         <div class="section-label" i18n>ACCOUNT</div>
@@ -18,7 +18,7 @@
                 (userChanged)="onUserChanged()" (userDeleted)="onUserDeleted()"
               ></my-user-moderation-dropdown>
 
-              <span *ngIf="accountUser?.blocked" [ngbTooltip]="accountUser.blockedReason" class="badge badge-danger" i18n>Banned</span>
+              <span *ngIf="accountUser?.blocked" [ngbTooltip]="accountUser.blockedReason" class="pt-badge badge-danger" i18n>Banned</span>
 
               <my-account-block-badges [account]="account"></my-account-block-badges>
             </div>
@@ -28,15 +28,15 @@
               <button [cdkCopyToClipboard]="account.nameWithHostForced" (click)="activateCopiedMessage()"
                       class="btn btn-outline-secondary btn-sm copy-button" title="Copy account handle" i18n-title
               >
-                <span class="glyphicon glyphicon-duplicate"></span>
+                <my-global-icon iconName="copy"></my-global-icon>
               </button>
             </div>
 
             <div class="actor-counters">
-              <span i18n>{naiveAggregatedSubscribers(), plural, =1 {1 subscriber} other {{{ naiveAggregatedSubscribers() }} subscribers}}</span>
+              <span i18n>{naiveAggregatedSubscribers(), plural, =0 {No subscribers} =1 {1 subscriber} other {{{ naiveAggregatedSubscribers() }} subscribers}}</span>
 
               <span class="videos-count" *ngIf="accountVideosCount !== undefined" i18n>
-                {accountVideosCount, plural, =1 {1 videos} other {{{ accountVideosCount }} videos}}
+                {accountVideosCount, plural, =0 {No videos} =1 {1 video} other {{{ accountVideosCount }} videos}}
               </span>
             </div>
           </div>
@@ -66,7 +66,7 @@
 
   <div class="links" [ngClass]="{ 'on-channel-page': isOnChannelPage() }">
     <ng-template #linkTemplate let-item="item">
-      <a [routerLink]="item.routerLink" routerLinkActive="active" class="title-page">{{ item.label }}</a>
+      <a [routerLink]="item.routerLink" routerLinkActive="active" class="sub-menu-entry">{{ item.label }}</a>
     </ng-template>
 
     <my-list-overflow [hidden]="hideMenu" [items]="links" [itemTemplate]="linkTemplate"></my-list-overflow>
diff --git a/client/src/app/+accounts/accounts.component.scss b/client/src/app/+accounts/accounts.component.scss
index 5043b98c4..e5f86e61e 100644
--- a/client/src/app/+accounts/accounts.component.scss
+++ b/client/src/app/+accounts/accounts.component.scss
@@ -37,7 +37,13 @@ my-user-moderation-dropdown {
 }
 
 .copy-button {
+  @include margin-left(3px);
+
   border: 0;
+
+  my-global-icon {
+    width: 15px;
+  }
 }
 
 .account-info {
@@ -93,6 +99,10 @@ my-user-moderation-dropdown {
   }
 }
 
+.pt-badge {
+  @include margin-right(5px);
+}
+
 @media screen and (max-width: $small-view) {
   .root {
     --myGlobalTopPadding: 45px;
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index 898325492..cf66b817a 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -30,8 +30,6 @@ export class AccountsComponent implements OnInit, OnDestroy {
   links: ListOverflowItem[] = []
   hideMenu = false
 
-  accountFollowerTitle = ''
-
   accountVideosCount: number
   accountDescriptionHTML = ''
   accountDescriptionExpanded = false
@@ -121,12 +119,6 @@ export class AccountsComponent implements OnInit, OnDestroy {
     this.notifier.success($localize`Username copied`)
   }
 
-  subscribersDisplayFor (count: number) {
-    if (count === 1) return $localize`1 subscriber`
-
-    return $localize`${count} subscribers`
-  }
-
   searchChanged (search: string) {
     const queryParams = { search }
 
@@ -150,8 +142,6 @@ export class AccountsComponent implements OnInit, OnDestroy {
   }
 
   private async onAccount (account: Account) {
-    this.accountFollowerTitle = $localize`${account.followersCount} direct account followers`
-
     this.accountDescriptionHTML = await this.markdown.textMarkdownToHTML(account.description)
 
     // After the markdown renderer to avoid layout changes