diff options
| author | Chocobozzz <chocobozzz@framasoft.org> | 2020-06-11 10:36:04 +0200 |
|---|---|---|
| committer | Chocobozzz <chocobozzz@framasoft.org> | 2020-06-11 10:36:04 +0200 |
| commit | fa58a19819cb821a5c5a26802efd492461be9c04 (patch) | |
| tree | 72bd8307da8ac447bb9934b1301ab0d93ea97e6b /client/src/app/shared/users | |
| parent | 50a04125dac1a126cb79a9fb575fcf673c5ac2d6 (diff) | |
| parent | e95bede8fe660a38c99e51560caa5dd58a8eb23e (diff) | |
| download | PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.tar.gz PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.tar.zst PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.zip | |
Merge branch 'blacklist' into 'develop'
rename blacklist to block/blocklist, merge block and auto-block views
See merge request framasoft/peertube/PeerTube!30
Diffstat (limited to 'client/src/app/shared/users')
| -rw-r--r-- | client/src/app/shared/users/user-notifications.component.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/src/app/shared/users/user-notifications.component.html b/client/src/app/shared/users/user-notifications.component.html index 8dbe6e329..c6037f0a9 100644 --- a/client/src/app/shared/users/user-notifications.component.html +++ b/client/src/app/shared/users/user-notifications.component.html | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | <my-global-icon iconName="undo"></my-global-icon> | 30 | <my-global-icon iconName="undo"></my-global-icon> |
| 31 | 31 | ||
| 32 | <div class="message" i18n> | 32 | <div class="message" i18n> |
| 33 | Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> has been unblacklisted | 33 | Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> has been unblocked |
| 34 | </div> | 34 | </div> |
| 35 | </ng-container> | 35 | </ng-container> |
| 36 | 36 | ||
| @@ -38,7 +38,7 @@ | |||
| 38 | <my-global-icon iconName="no"></my-global-icon> | 38 | <my-global-icon iconName="no"></my-global-icon> |
| 39 | 39 | ||
| 40 | <div class="message" i18n> | 40 | <div class="message" i18n> |
| 41 | Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoBlacklist.video.name }}</a> has been blacklisted | 41 | Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoBlacklist.video.name }}</a> has been blocked |
| 42 | </div> | 42 | </div> |
| 43 | </ng-container> | 43 | </ng-container> |
| 44 | 44 | ||
| @@ -54,7 +54,7 @@ | |||
| 54 | <my-global-icon iconName="no"></my-global-icon> | 54 | <my-global-icon iconName="no"></my-global-icon> |
| 55 | 55 | ||
| 56 | <div class="message" i18n> | 56 | <div class="message" i18n> |
| 57 | The recently added video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoBlacklist.video.name }}</a> has been <a (click)="markAsRead(notification)" [routerLink]="notification.videoAutoBlacklistUrl">auto-blacklisted</a> | 57 | The recently added video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoBlacklist.video.name }}</a> has been <a (click)="markAsRead(notification)" [routerLink]="notification.videoAutoBlacklistUrl">automatically blocked</a> |
| 58 | </div> | 58 | </div> |
| 59 | </ng-container> | 59 | </ng-container> |
| 60 | 60 | ||