X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Flanguage-chooser.component.ts;h=4a6e4c75ae4b044be8afd83ebd645c90e312b1d4;hb=a0dedc02ca870a31298eb35d5105a1ebc34dbb4a;hp=3de6a129d356f28156b541a7095be51a7b46349a;hpb=8afc19a6121569da054462c7cb351a3f13030a32;p=oweals%2Fpeertube.git

diff --git a/client/src/app/menu/language-chooser.component.ts b/client/src/app/menu/language-chooser.component.ts
index 3de6a129d..4a6e4c75a 100644
--- a/client/src/app/menu/language-chooser.component.ts
+++ b/client/src/app/menu/language-chooser.component.ts
@@ -1,6 +1,7 @@
-import { Component, ViewChild } from '@angular/core'
-import { ModalDirective } from 'ngx-bootstrap/modal'
+import { Component, ElementRef, ViewChild } from '@angular/core'
 import { I18N_LOCALES } from '../../../../shared'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { sortBy } from '@app/shared/misc/utils'
 
 @Component({
   selector: 'my-language-chooser',
@@ -8,21 +9,19 @@ import { I18N_LOCALES } from '../../../../shared'
   styleUrls: [ './language-chooser.component.scss' ]
 })
 export class LanguageChooserComponent {
-  @ViewChild('modal') modal: ModalDirective
+  @ViewChild('modal', { static: true }) modal: ElementRef
 
-  languages: { [ id: string ]: string }[] = []
+  languages: { id: string, label: string }[] = []
 
-  constructor () {
-    this.languages = Object.keys(I18N_LOCALES)
-      .map(k => ({ id: k, label: I18N_LOCALES[k] }))
-  }
+  constructor (private modalService: NgbModal) {
+    const l = Object.keys(I18N_LOCALES)
+                    .map(k => ({ id: k, label: I18N_LOCALES[k] }))
 
-  show () {
-    this.modal.show()
+    this.languages = sortBy(l, 'label')
   }
 
-  hide () {
-    this.modal.hide()
+  show () {
+    this.modalService.open(this.modal)
   }
 
   buildLanguageLink (lang: { id: string }) {