12 files changed, 72 insertions, 66 deletions

diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html
index d74334b13..602214ac5 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
@@ -54,9 +54,7 @@
             <div class="video-info-date-views">
               <ng-container i18n>Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle></ng-container>
 
-              <span i18n
-                    title="{{ getExactNumberOfViews() }}"
-                    class="views">
+              <span i18n [title]="video.getExactNumberOfViews()" class="views">
                 • {{ video.views | myNumberFormatter }}
                 <ng-container *ngIf="!video.isLive">views</ng-container>
                 <ng-container *ngIf="video.isLive">viewers</ng-container>
@@ -73,9 +71,7 @@
               <div class="d-none d-md-block video-info-date-views">
                 <ng-container i18n>Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle></ng-container>
 
-                <span i18n
-                      title="{{ getExactNumberOfViews() }}"
-                      class="views">
+                <span i18n [title]="video.getExactNumberOfViews()" class="views">
                   • {{ video.views | myNumberFormatter }}
                   <ng-container *ngIf="!video.isLive">views</ng-container>
                   <ng-container *ngIf="video.isLive">viewers</ng-container>
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index bc047489e..66af9709d 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -219,12 +219,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     return $localize`You need to be <a href="/login">logged in</a> to rate this video.`
   }
 
-  getExactNumberOfViews () {
-    return (this.video.views >= 1000)
-      ? `${this.video.views} ${this.video.isLive ? $localize`viewers` : $localize`views`}`
-      : ''
-  }
-
   showMoreDescription () {
     if (this.completeVideoDescription === undefined) {
       return this.loadCompleteDescription()
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 75f4bdfe6..c5cb54ddd 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { Hotkey, HotkeysService } from 'angular2-hotkeys'
 import { concat } from 'rxjs'
-import { filter, first, map, pairwise } from 'rxjs/operators'
+import { filter, first, map, pairwise, tap } from 'rxjs/operators'
 import { DOCUMENT, PlatformLocation, ViewportScroller } from '@angular/common'
 import { AfterViewInit, Component, Inject, LOCALE_ID, OnInit, ViewChild } from '@angular/core'
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 5c4616153..3f874856d 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,11 +1,10 @@
 import 'focus-visible'
 import { APP_BASE_HREF, registerLocaleData } from '@angular/common'
-import { LOCALE_ID, NgModule, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core'
+import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { ServerService } from '@app/core'
 import localeOc from '@app/helpers/locales/oc'
 import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
-import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '@shared/core-utils/i18n'
 import { AppRoutingModule } from './app-routing.module'
 import { AppComponent } from './app.component'
 import { CoreModule } from './core'
diff --git a/client/src/app/core/routing/redirect.service.ts b/client/src/app/core/routing/redirect.service.ts
index 3982cf36f..4f4b346e2 100644
--- a/client/src/app/core/routing/redirect.service.ts
+++ b/client/src/app/core/routing/redirect.service.ts
@@ -11,6 +11,8 @@ export class RedirectService {
   private previousUrl: string
   private currentUrl: string
 
+  private redirectingToHomepage = false
+
   constructor (
     private router: Router,
     private serverService: ServerService
@@ -56,10 +58,17 @@ export class RedirectService {
   }
 
   redirectToHomepage (skipLocationChange = false) {
+    if (this.redirectingToHomepage) return
+
+    this.redirectingToHomepage = true
+
     console.log('Redirecting to %s...', RedirectService.DEFAULT_ROUTE)
 
     this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange })
+        .then(() => this.redirectingToHomepage = false)
         .catch(() => {
+          this.redirectingToHomepage = false
+
           console.error(
             'Cannot navigate to %s, resetting default route to %s.',
             RedirectService.DEFAULT_ROUTE,
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index 810466a72..bba5fdadf 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -12,7 +12,7 @@
             <div class="logged-in-username">@{{ user.username }}</div>
           </div>
 
-          <div class="logged-in-more" ngbDropdown [placement]="placement" container="body" autoClose="outside">
+          <div class="logged-in-more" ngbDropdown [placement]="loggedInMorePlacement" container="body" autoClose="outside">
             <my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon>
 
             <div ngbDropdownMenu>
@@ -32,7 +32,7 @@
               <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" (click)="openLanguageChooser()">
                 <my-global-icon iconName="language" aria-hidden="true"></my-global-icon>
                 <span i18n>Interface:</span>
-                <span class="ml-auto text-muted">{{ language }}</span>
+                <span class="ml-auto text-muted">{{ currentInterfaceLanguage }}</span>
               </a>
 
               <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/settings" fragment="video-languages-subtitles"
@@ -168,7 +168,7 @@
 
         <div class="footer-links">
           <div *ngIf="isLoggedIn === false">
-            <span role="button" (click)="openLanguageChooser()" class="c-hand" i18n>Interface: {{ language }}</span>
+            <span role="button" (click)="openLanguageChooser()" class="c-hand" i18n>Interface: {{ currentInterfaceLanguage }}</span>
           </div>
 
           <div>
diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts
index 97a3b6d24..bdc95127b 100644
--- a/client/src/app/menu/menu.component.ts
+++ b/client/src/app/menu/menu.component.ts
@@ -28,6 +28,11 @@ export class MenuComponent implements OnInit {
   helpVisible = false
 
   videoLanguages: string[] = []
+  nsfwPolicy: string
+
+  loggedInMorePlacement: string
+
+  currentInterfaceLanguage: string
 
   private languages: VideoConstant<string>[] = []
   private serverConfig: ServerConfig
@@ -52,37 +57,6 @@ export class MenuComponent implements OnInit {
     private router: Router
   ) { }
 
-  get isInMobileView () {
-    return this.screenService.isInMobileView()
-  }
-
-  get placement () {
-    if (this.isInMobileView) {
-      return 'left-top auto'
-    } else {
-      return 'right-top auto'
-    }
-  }
-
-  get language () {
-    return this.languageChooserModal.getCurrentLanguage()
-  }
-
-  get nsfwPolicy () {
-    if (!this.user) return
-
-    switch (this.user.nsfwPolicy) {
-      case 'do_not_list':
-        return $localize`hide`
-
-      case 'blur':
-        return $localize`blur`
-
-      case 'display':
-        return $localize`display`
-    }
-  }
-
   get instanceName () {
     return this.serverConfig.instance.name
   }
@@ -95,11 +69,19 @@ export class MenuComponent implements OnInit {
     this.isLoggedIn = this.authService.isLoggedIn()
     if (this.isLoggedIn === true) {
       this.user = this.authService.getUser()
+
+      this.computeNSFWPolicy()
       this.computeVideosLink()
     }
 
     this.computeAdminAccess()
 
+    this.loggedInMorePlacement = this.screenService.isInMobileView()
+      ? 'left-top auto'
+      : 'right-top auto'
+
+    this.currentInterfaceLanguage = this.languageChooserModal.getCurrentLanguage()
+
     this.authService.loginChangedSource.subscribe(
       status => {
         if (status === AuthStatus.LoggedIn) {
@@ -252,4 +234,25 @@ export class MenuComponent implements OnInit {
         else logger('User cannot see videos link.')
       })
   }
+
+  private computeNSFWPolicy () {
+    if (!this.user) {
+      this.nsfwPolicy = null
+      return
+    }
+
+    switch (this.user.nsfwPolicy) {
+      case 'do_not_list':
+        this.nsfwPolicy = $localize`hide`
+        break
+
+      case 'blur':
+        this.nsfwPolicy = $localize`blur`
+        break
+
+      case 'display':
+        this.nsfwPolicy = $localize`display`
+        break
+    }
+  }
 }
diff --git a/client/src/app/shared/shared-main/date/date-toggle.component.html b/client/src/app/shared/shared-main/date/date-toggle.component.html
index ebd4ce442..14b6e7d7a 100644
--- a/client/src/app/shared/shared-main/date/date-toggle.component.html
+++ b/client/src/app/shared/shared-main/date/date-toggle.component.html
@@ -1,6 +1,7 @@
 <span
   class="date-toggle"
   [title]="getTitle()"
-  [innerHtml]="getContent()"
   (click)="toggle()"
-></span>
+>
+  {{ getContent() }}
+</span>
diff --git a/client/src/app/shared/shared-main/date/date-toggle.component.ts b/client/src/app/shared/shared-main/date/date-toggle.component.ts
index bedf0ba4e..53f25f0ad 100644
--- a/client/src/app/shared/shared-main/date/date-toggle.component.ts
+++ b/client/src/app/shared/shared-main/date/date-toggle.component.ts
@@ -7,7 +7,7 @@ import { FromNowPipe } from '../angular/from-now.pipe'
   templateUrl: './date-toggle.component.html',
   styleUrls: [ './date-toggle.component.scss' ]
 })
-export class DateToggleComponent implements OnInit, OnChanges {
+export class DateToggleComponent implements OnChanges {
   @Input() date: Date
   @Input() toggled = false
 
@@ -19,10 +19,6 @@ export class DateToggleComponent implements OnInit, OnChanges {
     private fromNowPipe: FromNowPipe
   ) { }
 
-  ngOnInit () {
-    this.updateDates()
-  }
-
   ngOnChanges () {
     this.updateDates()
   }
@@ -32,15 +28,19 @@ export class DateToggleComponent implements OnInit, OnChanges {
   }
 
   getTitle () {
-    return this.toggled ? this.dateRelative : this.dateAbsolute
+    return this.toggled
+      ? this.dateRelative
+      : this.dateAbsolute
   }
 
   getContent () {
-    return this.toggled ? this.dateAbsolute : this.dateRelative
+    return this.toggled
+      ? this.dateAbsolute
+      : this.dateRelative
   }
 
   private updateDates () {
     this.dateRelative = this.fromNowPipe.transform(this.date)
-    this.dateAbsolute = this.datePipe.transform(this.date, 'long')
+    this.dateAbsolute = this.date.toLocaleDateString()
   }
 }
diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts
index 04e7bd717..adb6e884f 100644
--- a/client/src/app/shared/shared-main/video/video.model.ts
+++ b/client/src/app/shared/shared-main/video/video.model.ts
@@ -203,4 +203,14 @@ export class Video implements VideoServerModel {
   canBeDuplicatedBy (user: AuthUser) {
     return user && this.isLocal === false && user.hasRight(UserRight.MANAGE_VIDEOS_REDUNDANCIES)
   }
+
+  getExactNumberOfViews () {
+    if (this.views < 1000) return ''
+
+    if (this.isLive) {
+      return $localize`${this.views} viewers`
+    }
+
+    return $localize`${this.views} views`
+  }
 }
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.html
index b323002e3..395a4df97 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html
@@ -26,7 +26,7 @@
           <span class="video-miniature-created-at-views">
             <my-date-toggle *ngIf="displayOptions.date" [date]="video.publishedAt"></my-date-toggle>
 
-            <span class="views" title="{{ getExactNumberOfViews() }}">
+            <span class="views" [title]="video.getExactNumberOfViews()">
               <ng-container *ngIf="displayOptions.date && displayOptions.views"> • </ng-container>
               <ng-container i18n *ngIf="displayOptions.views">
                 {video.views, plural, =1 {1 view} other {{{ video.views | myNumberFormatter }} views}}
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
index e59255cf8..cc5665ab1 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
@@ -190,12 +190,6 @@ export class VideoMiniatureComponent implements OnInit {
     return this.video.videoChannelAvatarUrl
   }
 
-  getExactNumberOfViews () {
-    return (this.video.views >= 1000 && this.displayOptions.views)
-        ? `${this.video.views} ${this.video.isLive ? $localize`viewers` : $localize`views`}`
-        : ''
-  }
-
   loadActions () {
     if (this.displayVideoActions) this.showActions = true