]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Fix user ban modal grammar to account for multiple users (#4722)
authorThe Cashew Trader <81344401+thecashewtrader@users.noreply.github.com>
Fri, 14 Jan 2022 14:10:27 +0000 (19:40 +0530)
committerGitHub <noreply@github.com>
Fri, 14 Jan 2022 14:10:27 +0000 (15:10 +0100)
* Fix user ban modal grammar to account for multiple users

* Address variable sugggestion

* Address property syntax suggestion

* Address localization suggestion

* More concise `isSingleUser` declaration

client/src/app/shared/shared-moderation/user-ban-modal.component.html
client/src/app/shared/shared-moderation/user-ban-modal.component.ts

index 7129b00ca9e3414524ac5b1125eeb1191f717fa8..b41ae230d22510503e9e35b3a69636fd4b8de4f3 100644 (file)
@@ -27,7 +27,7 @@
           (click)="hide()" (key.enter)="hide()"
         >
 
-        <input type="submit" i18n-value value="Ban this user" class="peertube-button orange-button" [disabled]="!form.valid" />
+        <input type="submit" i18n-value [value]="modalMessage" class="peertube-button orange-button" [disabled]="!form.valid" />
       </div>
     </form>
   </div>
index a03bd728674a6c52296c188e843c2c700e74d56b..b2ce019c5b472a1ae642b660e32c1575852396f5 100644 (file)
@@ -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 () {