diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
index 465886e76..0604ae7df 100644
--- a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
+++ b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
@@ -222,4 +222,11 @@ export class MyVideoChannelsComponent {
return formatICU($localize`${data.total} {value, plural, =1 {view} other {views}} since ${data.startDate}`, { value: data.total })
}
+
+ getTotalTitle () {
+ return formatICU(
+ $localize`You have ${this.pagination.totalItems} {total, plural, =1 {channel} other {channels}}`,
+ { total: this.pagination.totalItems }
+ )
+ }
}
diff --git a/client/src/app/+my-library/my-follows/my-followers.component.html b/client/src/app/+my-library/my-follows/my-followers.component.html
index 743187edb..a39362166 100644
--- a/client/src/app/+my-library/my-follows/my-followers.component.html
+++ b/client/src/app/+my-library/my-follows/my-followers.component.html
@@ -2,7 +2,7 @@
My followers
- {{ pagination.totalItems }}
+ {{ pagination.totalItems }}
diff --git a/client/src/app/+my-library/my-follows/my-followers.component.ts b/client/src/app/+my-library/my-follows/my-followers.component.ts
index 7b1a8edc8..329870c8c 100644
--- a/client/src/app/+my-library/my-follows/my-followers.component.ts
+++ b/client/src/app/+my-library/my-follows/my-followers.component.ts
@@ -9,6 +9,7 @@ import { ActorAvatarComponent } from '../../shared/shared-actor-image/actor-avat
import { AdvancedInputFilter, AdvancedInputFilterComponent } from '../../shared/shared-forms/advanced-input-filter.component'
import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
import { InfiniteScrollerDirective } from '../../shared/shared-main/angular/infinite-scroller.directive'
+import { formatICU } from '@app/helpers'
@Component({
templateUrl: './my-followers.component.html',
@@ -74,6 +75,13 @@ export class MyFollowersComponent implements OnInit {
return follow.following.name === this.getUsername()
}
+ getTotalTitle () {
+ return formatICU(
+ $localize`You have ${this.pagination.totalItems} {total, plural, =1 {follower} other {followers}}`,
+ { total: this.pagination.totalItems }
+ )
+ }
+
private loadFollowers (more = true) {
this.userSubscriptionService.listFollowers({
pagination: this.pagination,
diff --git a/client/src/app/+my-library/my-follows/my-subscriptions.component.html b/client/src/app/+my-library/my-follows/my-subscriptions.component.html
index f928d8cab..b10a95603 100644
--- a/client/src/app/+my-library/my-follows/my-subscriptions.component.html
+++ b/client/src/app/+my-library/my-follows/my-subscriptions.component.html
@@ -2,7 +2,7 @@
My subscriptions
- {{ pagination.totalItems }}
+ {{ pagination.totalItems }}
diff --git a/client/src/app/+my-library/my-follows/my-subscriptions.component.ts b/client/src/app/+my-library/my-follows/my-subscriptions.component.ts
index 0cf70d6f9..bc802241b 100644
--- a/client/src/app/+my-library/my-follows/my-subscriptions.component.ts
+++ b/client/src/app/+my-library/my-follows/my-subscriptions.component.ts
@@ -10,6 +10,7 @@ import { NgIf, NgFor } from '@angular/common'
import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
import { VideoChannel } from '@app/shared/shared-main/video-channel/video-channel.model'
import { UserSubscriptionService } from '@app/shared/shared-user-subscription/user-subscription.service'
+import { formatICU } from '@app/helpers'
@Component({
templateUrl: './my-subscriptions.component.html',
@@ -57,6 +58,13 @@ export class MySubscriptionsComponent {
this.loadSubscriptions(false)
}
+ getTotalTitle () {
+ return formatICU(
+ $localize`You have ${this.pagination.totalItems} {total, plural, =1 {subscription} other {subscriptions}}`,
+ { total: this.pagination.totalItems }
+ )
+ }
+
private loadSubscriptions (more = true) {
this.userSubscriptionService.listSubscriptions({ pagination: this.pagination, search: this.search })
.subscribe({
diff --git a/client/src/app/+my-library/my-history/my-history.component.html b/client/src/app/+my-library/my-history/my-history.component.html
index 1046a8f8c..7203ba529 100644
--- a/client/src/app/+my-library/my-history/my-history.component.html
+++ b/client/src/app/+my-library/my-history/my-history.component.html
@@ -1,7 +1,7 @@
My watch history
- {{ pagination.totalItems }}
+ {{ pagination.totalItems }}
diff --git a/client/src/app/+my-library/my-history/my-history.component.ts b/client/src/app/+my-library/my-history/my-history.component.ts
index 568db4071..d0574dc08 100644
--- a/client/src/app/+my-library/my-history/my-history.component.ts
+++ b/client/src/app/+my-library/my-history/my-history.component.ts
@@ -1,7 +1,7 @@
import { tap } from 'rxjs/operators'
import { Component, OnInit, ViewChild } from '@angular/core'
import { AuthService, ComponentPagination, ConfirmService, DisableForReuseHook, Notifier, User, UserService } from '@app/core'
-import { immutableAssign } from '@app/helpers'
+import { formatICU, immutableAssign } from '@app/helpers'
import { DeleteButtonComponent } from '../../shared/shared-main/buttons/delete-button.component'
import { PeerTubeTemplateDirective } from '../../shared/shared-main/angular/peertube-template.directive'
import { FormsModule } from '@angular/forms'
@@ -162,4 +162,11 @@ export class MyHistoryComponent implements OnInit, DisableForReuseHook {
return $localize`You don't have any video in your watch history yet.`
}
+
+ getTotalTitle () {
+ return formatICU(
+ $localize`Your history contains ${this.pagination.totalItems} {total, plural, =1 {video} other {videos}}`,
+ { total: this.pagination.totalItems }
+ )
+ }
}
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html
index 79b90807b..6bbbf01ca 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html
@@ -1,7 +1,7 @@
My playlists
- {{ pagination.totalItems }}
+ {{ pagination.totalItems }}
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts
index 109cab800..696967aeb 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts
@@ -14,6 +14,7 @@ import { NgIf, NgFor } from '@angular/common'
import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
import { VideoPlaylist } from '@app/shared/shared-video-playlist/video-playlist.model'
import { VideoPlaylistService } from '@app/shared/shared-video-playlist/video-playlist.service'
+import { formatICU } from '@app/helpers'
@Component({
templateUrl: './my-video-playlists.component.html',
@@ -89,6 +90,13 @@ export class MyVideoPlaylistsComponent {
this.loadVideoPlaylists(true)
}
+ getTotalTitle () {
+ return formatICU(
+ $localize`You have ${this.pagination.totalItems} {total, plural, =1 {playlist} other {playlists}}`,
+ { total: this.pagination.totalItems }
+ )
+ }
+
private loadVideoPlaylists (reset = false) {
this.authService.userInformationLoaded
.pipe(mergeMap(() => {
diff --git a/client/src/app/+my-library/my-videos/my-videos.component.html b/client/src/app/+my-library/my-videos/my-videos.component.html
index 686e9fad3..b8092fb77 100644
--- a/client/src/app/+my-library/my-videos/my-videos.component.html
+++ b/client/src/app/+my-library/my-videos/my-videos.component.html
@@ -2,7 +2,7 @@
My videos
- {{ pagination.totalItems }}
+ {{ pagination.totalItems }}
diff --git a/client/src/app/+my-library/my-videos/my-videos.component.ts b/client/src/app/+my-library/my-videos/my-videos.component.ts
index cb58ee6c6..492137826 100644
--- a/client/src/app/+my-library/my-videos/my-videos.component.ts
+++ b/client/src/app/+my-library/my-videos/my-videos.component.ts
@@ -244,6 +244,13 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook {
this.videoChangeOwnershipModal.show(video)
}
+ getTotalTitle () {
+ return formatICU(
+ $localize`You have ${this.pagination.totalItems} {total, plural, =1 {video} other {videos}}`,
+ { total: this.pagination.totalItems }
+ )
+ }
+
private removeVideoFromArray (id: number) {
this.videos = this.videos.filter(v => v.id !== id)
}
diff --git a/client/src/app/+search/search.component.html b/client/src/app/+search/search.component.html
index 7e154e953..722cc7379 100644
--- a/client/src/app/+search/search.component.html
+++ b/client/src/app/+search/search.component.html
@@ -12,13 +12,15 @@
diff --git a/client/src/app/+search/search.component.ts b/client/src/app/+search/search.component.ts
index ee9324cae..cd320bb86 100644
--- a/client/src/app/+search/search.component.ts
+++ b/client/src/app/+search/search.component.ts
@@ -270,6 +270,10 @@ export class SearchComponent implements OnInit, OnDestroy {
return this.lastSearchTarget === 'search-index'
}
+ getFilterButtonTitle () {
+ return $localize`${this.numberOfFilters()} active filters, open the filters panel`
+ }
+
private resetPagination () {
this.pagination.currentPage = 1
this.pagination.totalItems = null
diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
index abcc67a75..8751492ea 100644
--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
@@ -1,5 +1,5 @@
import { NgClass, NgIf, NgStyle, NgTemplateOutlet } from '@angular/common'
-import { Component, EventEmitter, Input, Output, ViewChild, viewChild } from '@angular/core'
+import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'
import { RouterLink } from '@angular/router'
import { ScreenService } from '@app/core'
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'