X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Baccounts%2Faccount-videos%2Faccount-videos.component.ts;h=5a99aadcee5c876e5a8e268dc5ad1434f3ede06e;hb=34c7f429e411fb911dfa56a816b638fd665717a4;hp=eca9fb6b74ae75797571bef7a7f9dff60f9de9c7;hpb=0bf1f2652382089c06434a7d297b638aad778b52;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+accounts/account-videos/account-videos.component.ts b/client/src/app/+accounts/account-videos/account-videos.component.ts
index eca9fb6b7..5a99aadce 100644
--- a/client/src/app/+accounts/account-videos/account-videos.component.ts
+++ b/client/src/app/+accounts/account-videos/account-videos.component.ts
@@ -1,15 +1,17 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
-import { Location } from '@angular/common'
 import { immutableAssign } from '@app/shared/misc/utils'
-import { NotificationsService } from 'angular2-notifications'
 import { AuthService } from '../../core/auth'
 import { ConfirmService } from '../../core/confirm'
 import { AbstractVideoList } from '../../shared/video/abstract-video-list'
 import { VideoService } from '../../shared/video/video.service'
 import { Account } from '@app/shared/account/account.model'
 import { AccountService } from '@app/shared/account/account.service'
-import { tap } from 'rxjs/operators'
+import { first, tap } from 'rxjs/operators'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { Subscription } from 'rxjs'
+import { ScreenService } from '@app/shared/misc/screen.service'
+import { Notifier, ServerService } from '@app/core'
 
 @Component({
   selector: 'my-account-videos',
@@ -20,20 +22,21 @@ import { tap } from 'rxjs/operators'
   ]
 })
 export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
-  titlePage = 'Published videos'
-  marginContent = false // Disable margin
-  currentRoute = '/account/videos'
+  titlePage: string
   loadOnInit = false
 
   private account: Account
+  private accountSub: Subscription
 
   constructor (
+    protected i18n: I18n,
     protected router: Router,
+    protected serverService: ServerService,
     protected route: ActivatedRoute,
     protected authService: AuthService,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected confirmService: ConfirmService,
-    protected location: Location,
+    protected screenService: ScreenService,
     private accountService: AccountService,
     private videoService: VideoService
   ) {
@@ -44,17 +47,19 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit,
     super.ngOnInit()
 
     // Parent get the account for us
-    this.accountService.accountLoaded
-      .subscribe(account => {
-        this.account = account
-        this.currentRoute = '/account/' + this.account.id + '/videos'
+    this.accountSub = this.accountService.accountLoaded
+                          .pipe(first())
+                          .subscribe(account => {
+                            this.account = account
 
-        this.loadMoreVideos(this.pagination.currentPage)
-        this.generateSyndicationList()
-      })
+                            this.reloadVideos()
+                            this.generateSyndicationList()
+                          })
   }
 
   ngOnDestroy () {
+    if (this.accountSub) this.accountSub.unsubscribe()
+
     super.ngOnDestroy()
   }
 
@@ -63,7 +68,11 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit,
 
     return this.videoService
                .getAccountVideos(this.account, newPagination, this.sort)
-               .pipe(tap(({ totalVideos }) => this.titlePage = `Published ${totalVideos} videos`))
+               .pipe(
+                 tap(({ totalVideos }) => {
+                   this.titlePage = this.i18n('Published {{totalVideos}} videos', { totalVideos })
+                 })
+               )
   }
 
   generateSyndicationList () {