3 files changed, 24 insertions, 78 deletions

diff --git a/client/src/app/shared/shared-user-settings/user-video-settings.component.html b/client/src/app/shared/shared-user-settings/user-video-settings.component.html
index a49e11485..bc9dd0f7f 100644
--- a/client/src/app/shared/shared-user-settings/user-video-settings.component.html
+++ b/client/src/app/shared/shared-user-settings/user-video-settings.component.html
@@ -30,12 +30,7 @@
     </my-help>
 
     <div>
-      <my-select-checkbox
-        formControlName="videoLanguages" [availableItems]="languageItems"
-        [selectableGroup]="true" [selectableGroupAsModel]="true"
-        i18n-placeholder placeholder="Add a new language"
-      >
-      </my-select-checkbox >
+      <my-select-languages formControlName="videoLanguages"></my-select-languages>
     </div>
   </div>
 
diff --git a/client/src/app/shared/shared-user-settings/user-video-settings.component.scss b/client/src/app/shared/shared-user-settings/user-video-settings.component.scss
index 4b007b691..c4f6020d4 100644
--- a/client/src/app/shared/shared-user-settings/user-video-settings.component.scss
+++ b/client/src/app/shared/shared-user-settings/user-video-settings.component.scss
@@ -19,7 +19,7 @@ input[type=submit] {
   margin-bottom: 30px;
 }
 
-my-select-checkbox {
+my-select-languages {
   @include responsive-width(340px);
 
   display: block;
diff --git a/client/src/app/shared/shared-user-settings/user-video-settings.component.ts b/client/src/app/shared/shared-user-settings/user-video-settings.component.ts
index 5d6e11c04..0cd889a8a 100644
--- a/client/src/app/shared/shared-user-settings/user-video-settings.component.ts
+++ b/client/src/app/shared/shared-user-settings/user-video-settings.component.ts
@@ -1,12 +1,11 @@
 import { pick } from 'lodash-es'
-import { forkJoin, Subject, Subscription } from 'rxjs'
+import { Subject, Subscription } from 'rxjs'
 import { first } from 'rxjs/operators'
 import { Component, Input, OnDestroy, OnInit } from '@angular/core'
 import { AuthService, Notifier, ServerService, User, UserService } from '@app/core'
-import { FormReactive, FormValidatorService, ItemSelectCheckboxValue } from '@app/shared/shared-forms'
+import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
 import { UserUpdateMe } from '@shared/models'
 import { NSFWPolicyType } from '@shared/models/videos/nsfw-policy.type'
-import { SelectOptionsItem } from '../../../types/select-options-item.model'
 
 @Component({
   selector: 'my-user-video-settings',
@@ -19,12 +18,9 @@ export class UserVideoSettingsComponent extends FormReactive implements OnInit,
   @Input() notifyOnUpdate = true
   @Input() userInformationLoaded: Subject<any>
 
-  languageItems: SelectOptionsItem[] = []
   defaultNSFWPolicy: NSFWPolicyType
   formValuesWatcher: Subscription
 
-  private allLanguagesGroup: string
-
   constructor (
     protected formValidatorService: FormValidatorService,
     private authService: AuthService,
@@ -36,8 +32,6 @@ export class UserVideoSettingsComponent extends FormReactive implements OnInit,
   }
 
   ngOnInit () {
-    this.allLanguagesGroup = $localize`All languages`
-
     this.buildForm({
       nsfwPolicy: null,
       webTorrentEnabled: null,
@@ -46,33 +40,23 @@ export class UserVideoSettingsComponent extends FormReactive implements OnInit,
       videoLanguages: null
     })
 
-    forkJoin([
-      this.serverService.getVideoLanguages(),
-      this.userInformationLoaded.pipe(first())
-    ]).subscribe(([ languages ]) => {
-      const group = this.allLanguagesGroup
-
-      this.languageItems = [ { label: $localize`Unknown language`, id: '_unknown', group } ]
-      this.languageItems = this.languageItems
-                               .concat(languages.map(l => ({ label: l.label, id: l.id, group })))
-
-      const videoLanguages: ItemSelectCheckboxValue[] = this.user.videoLanguages
-        ? this.user.videoLanguages.map(l => ({ id: l }))
-        : [ { group } ]
-
-      const serverConfig = this.serverService.getHTMLConfig()
-      this.defaultNSFWPolicy = serverConfig.instance.defaultNSFWPolicy
-
-      this.form.patchValue({
-        nsfwPolicy: this.user.nsfwPolicy || this.defaultNSFWPolicy,
-        webTorrentEnabled: this.user.webTorrentEnabled,
-        autoPlayVideo: this.user.autoPlayVideo === true,
-        autoPlayNextVideo: this.user.autoPlayNextVideo,
-        videoLanguages
-      })
-
-      if (this.reactiveUpdate) this.handleReactiveUpdate()
-    })
+    this.userInformationLoaded.pipe(first())
+      .subscribe(
+        () => {
+          const serverConfig = this.serverService.getHTMLConfig()
+          this.defaultNSFWPolicy = serverConfig.instance.defaultNSFWPolicy
+
+          this.form.patchValue({
+            nsfwPolicy: this.user.nsfwPolicy || this.defaultNSFWPolicy,
+            webTorrentEnabled: this.user.webTorrentEnabled,
+            autoPlayVideo: this.user.autoPlayVideo === true,
+            autoPlayNextVideo: this.user.autoPlayNextVideo,
+            videoLanguages: this.user.videoLanguages
+          })
+
+          if (this.reactiveUpdate) this.handleReactiveUpdate()
+        }
+      )
   }
 
   ngOnDestroy () {
@@ -85,23 +69,15 @@ export class UserVideoSettingsComponent extends FormReactive implements OnInit,
     const autoPlayVideo = this.form.value['autoPlayVideo']
     const autoPlayNextVideo = this.form.value['autoPlayNextVideo']
 
-    let videoLanguagesForm = this.form.value['videoLanguages']
+    const videoLanguages = this.form.value['videoLanguages']
 
-    if (Array.isArray(videoLanguagesForm)) {
-      if (videoLanguagesForm.length > 20) {
+    if (Array.isArray(videoLanguages)) {
+      if (videoLanguages.length > 20) {
         this.notifier.error($localize`Too many languages are enabled. Please enable them all or stay below 20 enabled languages.`)
         return
       }
-
-      // Automatically use "All languages" if the user did not select any language
-      if (videoLanguagesForm.length === 0) {
-        videoLanguagesForm = [ this.allLanguagesGroup ]
-        this.form.patchValue({ videoLanguages: [ { group: this.allLanguagesGroup } ] })
-      }
     }
 
-    const videoLanguages = this.buildLanguagesFromForm(videoLanguagesForm)
-
     let details: UserUpdateMe = {
       nsfwPolicy,
       webTorrentEnabled,
@@ -123,31 +99,6 @@ export class UserVideoSettingsComponent extends FormReactive implements OnInit,
     return this.updateAnonymousProfile(details)
   }
 
-  private buildLanguagesFromForm (videoLanguages: ItemSelectCheckboxValue[]) {
-    if (!Array.isArray(videoLanguages)) return undefined
-
-    // null means "All"
-    if (videoLanguages.length === this.languageItems.length) return null
-
-    if (videoLanguages.length === 1) {
-      const videoLanguage = videoLanguages[0]
-
-      if (typeof videoLanguage === 'string') {
-        if (videoLanguage === this.allLanguagesGroup) return null
-      } else {
-        if (videoLanguage.group === this.allLanguagesGroup) return null
-      }
-    }
-
-    return videoLanguages.map(l => {
-      if (typeof l === 'string') return l
-
-      if (l.group) return l.group
-
-      return l.id + ''
-    })
-  }
-
   private handleReactiveUpdate () {
     let oldForm = { ...this.form.value }