From: The Cashew Trader <81344401+thecashewtrader@users.noreply.github.com> Date: Fri, 14 Jan 2022 14:10:27 +0000 (+0530) Subject: Fix user ban modal grammar to account for multiple users (#4722) X-Git-Tag: v4.1.0-rc.1~141 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=884b17773d113d71472fe86f7076087c784943a6;p=github%2FChocobozzz%2FPeerTube.git Fix user ban modal grammar to account for multiple users (#4722) * Fix user ban modal grammar to account for multiple users * Address variable sugggestion * Address property syntax suggestion * Address localization suggestion * More concise `isSingleUser` declaration --- diff --git a/client/src/app/shared/shared-moderation/user-ban-modal.component.html b/client/src/app/shared/shared-moderation/user-ban-modal.component.html index 7129b00ca..b41ae230d 100644 --- a/client/src/app/shared/shared-moderation/user-ban-modal.component.html +++ b/client/src/app/shared/shared-moderation/user-ban-modal.component.html @@ -27,7 +27,7 @@ (click)="hide()" (key.enter)="hide()" > - + diff --git a/client/src/app/shared/shared-moderation/user-ban-modal.component.ts b/client/src/app/shared/shared-moderation/user-ban-modal.component.ts index a03bd7286..b2ce019c5 100644 --- a/client/src/app/shared/shared-moderation/user-ban-modal.component.ts +++ b/client/src/app/shared/shared-moderation/user-ban-modal.component.ts @@ -17,6 +17,7 @@ export class UserBanModalComponent extends FormReactive implements OnInit { private usersToBan: User | User[] private openedModal: NgbModalRef + modalMessage = '' constructor ( protected formValidatorService: FormValidatorService, @@ -36,6 +37,9 @@ export class UserBanModalComponent extends FormReactive implements OnInit { openModal (user: User | User[]) { this.usersToBan = user this.openedModal = this.modalService.open(this.modal, { centered: true }) + + const isSingleUser = !(Array.isArray(this.usersToBan) && this.usersToBan.length > 1) + this.modalMessage = isSingleUser ? $localize`Ban this user` : $localize`Ban these users` } hide () {