From 1e9c1b1b44b4cbd4bc4b1e97e8e6ba2df93371de Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Fri, 24 Dec 2021 09:27:27 +0100 Subject: [PATCH] Move zxx to its own group in select-languages component (#4664) * Move zxx to its own group in select-languages component * Fix lint * Fix lint, again * Apply requested changes --- .../select/select-languages.component.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/client/src/app/shared/shared-forms/select/select-languages.component.ts b/client/src/app/shared/shared-forms/select/select-languages.component.ts index 742163ede..6b5415785 100644 --- a/client/src/app/shared/shared-forms/select/select-languages.component.ts +++ b/client/src/app/shared/shared-forms/select/select-languages.component.ts @@ -20,7 +20,7 @@ export class SelectLanguagesComponent implements ControlValueAccessor, OnInit { @Input() maxLanguages: number selectedLanguages: ItemSelectCheckboxValue[] - availableLanguages: SelectOptionsItem[] = [] + availableLanguages: (SelectOptionsItem & { groupOrder: number })[] = [] allLanguagesGroup = $localize`All languages` @@ -38,10 +38,20 @@ export class SelectLanguagesComponent implements ControlValueAccessor, OnInit { this.server.getVideoLanguages() .subscribe( languages => { - this.availableLanguages = [ { label: $localize`Unknown language`, id: '_unknown', group: this.allLanguagesGroup } ] + this.availableLanguages = [ { + label: $localize`Unknown language`, + id: '_unknown', + group: this.allLanguagesGroup, + groupOrder: 1 + } ] this.availableLanguages = this.availableLanguages - .concat(languages.map(l => ({ label: l.label, id: l.id, group: this.allLanguagesGroup }))) + .concat(languages.map(l => { + if (l.id === 'zxx') return { label: l.label, id: l.id, group: $localize`Other`, groupOrder: 0 } + return { label: l.label, id: l.id, group: this.allLanguagesGroup, groupOrder: 1 } + })) + + this.availableLanguages.sort((a, b) => a.groupOrder - b.groupOrder) this.loaded = true this.writeValue(this.toWrite) -- 2.41.0