diff options
Diffstat (limited to 'client/src/app/+accounts')
5 files changed, 23 insertions, 13 deletions
diff --git a/client/src/app/+accounts/account-about/account-about.component.html b/client/src/app/+accounts/account-about/account-about.component.html index eae1cb509..b178f5cc8 100644 --- a/client/src/app/+accounts/account-about/account-about.component.html +++ b/client/src/app/+accounts/account-about/account-about.component.html | |||
@@ -1,12 +1,12 @@ | |||
1 | <div *ngIf="account" class="row"> | 1 | <div *ngIf="account" class="row"> |
2 | <div class="block col-md-6 col-sm-12"> | 2 | <div class="block col-md-6 col-sm-12"> |
3 | <div class="small-title">Description</div> | 3 | <div i18n class="small-title">Description</div> |
4 | <div class="content">{{ getAccountDescription() }}</div> | 4 | <div class="content">{{ getAccountDescription() }}</div> |
5 | </div> | 5 | </div> |
6 | 6 | ||
7 | <div class="block col-md-6 col-sm-12"> | 7 | <div class="block col-md-6 col-sm-12"> |
8 | <div class="small-title">Stats</div> | 8 | <div i18n class="small-title">Stats</div> |
9 | 9 | ||
10 | <div class="content">Joined {{ account.createdAt | date }}</div> | 10 | <div i18n class="content">Joined {{ account.createdAt | date }}</div> |
11 | </div> | 11 | </div> |
12 | </div> \ No newline at end of file | 12 | </div> \ No newline at end of file |
diff --git a/client/src/app/+accounts/account-about/account-about.component.ts b/client/src/app/+accounts/account-about/account-about.component.ts index f063df392..4086510ba 100644 --- a/client/src/app/+accounts/account-about/account-about.component.ts +++ b/client/src/app/+accounts/account-about/account-about.component.ts | |||
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core' | |||
2 | import { ActivatedRoute } from '@angular/router' | 2 | import { ActivatedRoute } from '@angular/router' |
3 | import { Account } from '@app/shared/account/account.model' | 3 | import { Account } from '@app/shared/account/account.model' |
4 | import { AccountService } from '@app/shared/account/account.service' | 4 | import { AccountService } from '@app/shared/account/account.service' |
5 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
5 | 6 | ||
6 | @Component({ | 7 | @Component({ |
7 | selector: 'my-account-about', | 8 | selector: 'my-account-about', |
@@ -12,7 +13,8 @@ export class AccountAboutComponent implements OnInit { | |||
12 | account: Account | 13 | account: Account |
13 | 14 | ||
14 | constructor ( | 15 | constructor ( |
15 | protected route: ActivatedRoute, | 16 | private route: ActivatedRoute, |
17 | private i18n: I18n, | ||
16 | private accountService: AccountService | 18 | private accountService: AccountService |
17 | ) { } | 19 | ) { } |
18 | 20 | ||
@@ -25,6 +27,6 @@ export class AccountAboutComponent implements OnInit { | |||
25 | getAccountDescription () { | 27 | getAccountDescription () { |
26 | if (this.account.description) return this.account.description | 28 | if (this.account.description) return this.account.description |
27 | 29 | ||
28 | return 'No description' | 30 | return this.i18n('No description') |
29 | } | 31 | } |
30 | } | 32 | } |
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 d20b40c60..bcd3beaf0 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,11 +1,11 @@ | |||
1 | <div *ngIf="account" class="row"> | 1 | <div *ngIf="account" class="row"> |
2 | <a | 2 | <a |
3 | *ngFor="let videoChannel of videoChannels" [routerLink]="[ '/video-channels', videoChannel.uuid ]" | 3 | *ngFor="let videoChannel of videoChannels" [routerLink]="[ '/video-channels', videoChannel.uuid ]" |
4 | class="video-channel" title="See this video channel" | 4 | class="video-channel" i18n-title title="See this video channel" |
5 | > | 5 | > |
6 | <img [src]="videoChannel.avatarUrl" alt="Avatar" /> | 6 | <img [src]="videoChannel.avatarUrl" alt="Avatar" /> |
7 | 7 | ||
8 | <div class="video-channel-display-name">{{ videoChannel.displayName }}</div> | 8 | <div class="video-channel-display-name">{{ videoChannel.displayName }}</div> |
9 | <div class="video-channel-followers">{{ videoChannel.followersCount }} subscribers</div> | 9 | <div i18n class="video-channel-followers">{{ videoChannel.followersCount }} subscribers</div> |
10 | </a> | 10 | </a> |
11 | </div> \ No newline at end of file | 11 | </div> \ No newline at end of file |
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..7b7629480 100644 --- a/client/src/app/+accounts/account-videos/account-videos.component.ts +++ b/client/src/app/+accounts/account-videos/account-videos.component.ts | |||
@@ -10,6 +10,7 @@ import { VideoService } from '../../shared/video/video.service' | |||
10 | import { Account } from '@app/shared/account/account.model' | 10 | import { Account } from '@app/shared/account/account.model' |
11 | import { AccountService } from '@app/shared/account/account.service' | 11 | import { AccountService } from '@app/shared/account/account.service' |
12 | import { tap } from 'rxjs/operators' | 12 | import { tap } from 'rxjs/operators' |
13 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
13 | 14 | ||
14 | @Component({ | 15 | @Component({ |
15 | selector: 'my-account-videos', | 16 | selector: 'my-account-videos', |
@@ -20,7 +21,7 @@ import { tap } from 'rxjs/operators' | |||
20 | ] | 21 | ] |
21 | }) | 22 | }) |
22 | export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { | 23 | export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { |
23 | titlePage = 'Published videos' | 24 | titlePage: string |
24 | marginContent = false // Disable margin | 25 | marginContent = false // Disable margin |
25 | currentRoute = '/account/videos' | 26 | currentRoute = '/account/videos' |
26 | loadOnInit = false | 27 | loadOnInit = false |
@@ -34,10 +35,13 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit, | |||
34 | protected notificationsService: NotificationsService, | 35 | protected notificationsService: NotificationsService, |
35 | protected confirmService: ConfirmService, | 36 | protected confirmService: ConfirmService, |
36 | protected location: Location, | 37 | protected location: Location, |
38 | protected i18n: I18n, | ||
37 | private accountService: AccountService, | 39 | private accountService: AccountService, |
38 | private videoService: VideoService | 40 | private videoService: VideoService |
39 | ) { | 41 | ) { |
40 | super() | 42 | super() |
43 | |||
44 | this.titlePage = this.i18n('Published videos') | ||
41 | } | 45 | } |
42 | 46 | ||
43 | ngOnInit () { | 47 | ngOnInit () { |
@@ -63,7 +67,11 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit, | |||
63 | 67 | ||
64 | return this.videoService | 68 | return this.videoService |
65 | .getAccountVideos(this.account, newPagination, this.sort) | 69 | .getAccountVideos(this.account, newPagination, this.sort) |
66 | .pipe(tap(({ totalVideos }) => this.titlePage = `Published ${totalVideos} videos`)) | 70 | .pipe( |
71 | tap(({ totalVideos }) => { | ||
72 | this.titlePage = this.i18n('Published {{ totalVideos }} videos', { totalVideos }) | ||
73 | }) | ||
74 | ) | ||
67 | } | 75 | } |
68 | 76 | ||
69 | generateSyndicationList () { | 77 | generateSyndicationList () { |
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html index e872bda03..69f648269 100644 --- a/client/src/app/+accounts/accounts.component.html +++ b/client/src/app/+accounts/accounts.component.html | |||
@@ -9,16 +9,16 @@ | |||
9 | <div class="actor-display-name">{{ account.displayName }}</div> | 9 | <div class="actor-display-name">{{ account.displayName }}</div> |
10 | <div class="actor-name">{{ account.nameWithHost }}</div> | 10 | <div class="actor-name">{{ account.nameWithHost }}</div> |
11 | </div> | 11 | </div> |
12 | <div class="actor-followers">{{ account.followersCount }} subscribers</div> | 12 | <div i18n class="actor-followers">{{ account.followersCount }} subscribers</div> |
13 | </div> | 13 | </div> |
14 | </div> | 14 | </div> |
15 | 15 | ||
16 | <div class="links"> | 16 | <div class="links"> |
17 | <a routerLink="videos" routerLinkActive="active" class="title-page">Videos</a> | 17 | <a i18n routerLink="videos" routerLinkActive="active" class="title-page">Videos</a> |
18 | 18 | ||
19 | <a routerLink="video-channels" routerLinkActive="active" class="title-page">Video channels</a> | 19 | <a i18n routerLink="video-channels" routerLinkActive="active" class="title-page">Video channels</a> |
20 | 20 | ||
21 | <a routerLink="about" routerLinkActive="active" class="title-page">About</a> | 21 | <a i18n routerLink="about" routerLinkActive="active" class="title-page">About</a> |
22 | </div> | 22 | </div> |
23 | </div> | 23 | </div> |
24 | 24 | ||