Merge branch 'master' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / menu / menu.component.ts

diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts
index ce209457ca8d06e609da3e0fe622171ac93d52bb..015c14bce70aee2cb83ffe0a1d2e9c23a53c7058 100644 (file)
--- a/client/src/app/menu/menu.component.ts
+++ b/client/src/app/menu/menu.component.ts
@@ -8,6 +8,7 @@ import { HotkeysService } from 'angular2-hotkeys'
 import { ServerConfig, VideoConstant } from '@shared/models'
 import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
 import { I18n } from '@ngx-translate/i18n-polyfill'
+import { ScreenService } from '@app/shared/misc/screen.service'
 
 @Component({
   selector: 'my-menu',
@@ -23,8 +24,10 @@ export class MenuComponent implements OnInit {
 
   userHasAdminAccess = false
   helpVisible = false
-  languages: VideoConstant<string>[] = []
 
+  videoLanguages: string[] = []
+
+  private languages: VideoConstant<string>[] = []
   private serverConfig: ServerConfig
   private routesPerRight: { [ role in UserRight ]?: string } = {
     [UserRight.MANAGE_USERS]: '/admin/users',
@@ -41,8 +44,21 @@ export class MenuComponent implements OnInit {
     private serverService: ServerService,
     private redirectService: RedirectService,
     private hotkeysService: HotkeysService,
+    private screenService: ScreenService,
     private i18n: I18n
-  ) {}
+  ) { }
+
+  get isInMobileView () {
+    return this.screenService.isInMobileView()
+  }
+
+  get placement () {
+    if (this.isInMobileView) {
+      return 'left-top auto'
+    } else {
+      return 'right-top auto'
+    }
+  }
 
   ngOnInit () {
     this.serverConfig = this.serverService.getTmpConfig()
@@ -71,30 +87,32 @@ export class MenuComponent implements OnInit {
       }
     )
 
-    this.hotkeysService.cheatSheetToggle.subscribe(isOpen => this.helpVisible = isOpen)
+    this.hotkeysService.cheatSheetToggle
+        .subscribe(isOpen => this.helpVisible = isOpen)
 
-    this.serverService.getVideoLanguages().subscribe(languages => this.languages = languages)
+    this.serverService.getVideoLanguages()
+        .subscribe(languages => {
+          this.languages = languages
+
+          this.authService.userInformationLoaded
+              .subscribe(() => this.buildUserLanguages())
+        })
   }
 
   get language () {
     return this.languageChooserModal.getCurrentLanguage()
   }
 
-  get videoLanguages (): string[] {
-    if (!this.user) return
-    if (!this.user.videoLanguages) return [this.i18n('any language')]
-    return this.user.videoLanguages
-      .map(locale => this.langForLocale(locale))
-      .map(value => value === undefined ? '?' : value)
-  }
-
   get nsfwPolicy () {
     if (!this.user) return
+
     switch (this.user.nsfwPolicy) {
       case 'do_not_list':
         return this.i18n('hide')
+
       case 'blur':
         return this.i18n('blur')
+
       case 'display':
         return this.i18n('display')
     }
@@ -156,13 +174,31 @@ export class MenuComponent implements OnInit {
   toggleUseP2P () {
     if (!this.user) return
     this.user.webTorrentEnabled = !this.user.webTorrentEnabled
-    this.userService.updateMyProfile({
-      webTorrentEnabled: this.user.webTorrentEnabled
-    }).subscribe(() => this.authService.refreshUserInformation())
+
+    this.userService.updateMyProfile({ webTorrentEnabled: this.user.webTorrentEnabled })
+        .subscribe(() => this.authService.refreshUserInformation())
   }
 
   langForLocale (localeId: string) {
-    return this.languages.find(lang => lang.id = localeId).label
+    if (localeId === '_unknown') return this.i18n('Unknown')
+
+    return this.languages.find(lang => lang.id === localeId).label
+  }
+
+  private buildUserLanguages () {
+    if (!this.user) {
+      this.videoLanguages = []
+      return
+    }
+
+    if (!this.user.videoLanguages) {
+      this.videoLanguages = [ this.i18n('any language') ]
+      return
+    }
+
+    this.videoLanguages = this.user.videoLanguages
+                              .map(locale => this.langForLocale(locale))
+                              .map(value => value === undefined ? '?' : value)
   }
 
   private computeIsUserHasAdminAccess () {