Make subscribe buttons observe subscription statuses to synchronise

3 files changed, 8 insertions, 17 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 93f43a350..781156840 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
@@ -9,11 +9,7 @@
           <img [src]="videoChannel.avatarUrl" alt="Avatar" />
 
           <div>{{ videoChannel.displayName }}</div>
-          <div class="followers">{{ videoChannel.followersCount }} 
-            <ng-container *ngIf="videoChannel.followersCount === 1; then single; else multiple"></ng-container>
-            <ng-template i18n #single>subscriber</ng-template>
-            <ng-template i18n #multiple>subscribers</ng-template>
-          </div>
+          <div class="followers" i18n>{videoChannel.followersCount, plural, =1 {1 subscriber} other {{{ videoChannel.followersCount }} subscribers}}</div>
         </a>
 
         <my-subscribe-button [videoChannels]="[videoChannel]"></my-subscribe-button>
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html
index 1b6eb480e..be40b63ca 100644
--- a/client/src/app/+accounts/accounts.component.html
+++ b/client/src/app/+accounts/accounts.component.html
@@ -28,12 +28,7 @@
           >
           </my-user-moderation-dropdown>
         </div>
-        <div class="actor-followers">
-          {{ account.followersCount }} 
-          <ng-container *ngIf="account.followersCount === 1; then single; else multiple"></ng-container>
-          <ng-template i18n #single>subscriber</ng-template>
-          <ng-template i18n #multiple>subscribers</ng-template>
-        </div>
+        <div class="actor-followers" i18n>{account.followersCount, plural, =1 {1 subscriber} other {{{ account.followersCount }} subscribers}}</div>
       </div>
 
       <my-subscribe-button *ngIf="videoChannels" [account]="account" [videoChannels]="videoChannels"></my-subscribe-button>
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index e3a503f4c..8bde7ad07 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -40,15 +40,15 @@ export class AccountsComponent implements OnInit, OnDestroy {
         map(params => params[ 'accountId' ]),
         distinctUntilChanged(),
         switchMap(accountId => this.accountService.getAccount(accountId)),
-        tap(account => this.getUserIfNeeded(account)),
+        tap(account => {
+          this.account = account
+          this.getUserIfNeeded(account)
+        }),
+        switchMap(account => this.videoChannelService.listAccountVideoChannels(account)),
         catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ]))
       )
       .subscribe(
-        account => {
-          this.account = account
-          this.videoChannelService.listAccountVideoChannels(account)
-            .subscribe(videoChannels => this.videoChannels = videoChannels.data)
-        },
+        videoChannels => this.videoChannels = videoChannels.data,
 
         err => this.notifier.error(err.message)
       )