- Interface: {{ language }}
+ Interface: {{ currentInterfaceLanguage }}
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[] = []
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 @@
+>
+ {{ getContent() }}
+
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/main.ts b/client/src/main.ts
index 2d1749c42..0fddf3aac 100644
--- a/client/src/main.ts
+++ b/client/src/main.ts
@@ -1,6 +1,6 @@
-import { enableProdMode } from '@angular/core'
+import { ApplicationRef, enableProdMode } from '@angular/core'
+import { enableDebugTools } from '@angular/platform-browser'
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
-
import { AppModule } from './app/app.module'
import { environment } from './environments/environment'
@@ -27,6 +27,14 @@ const bootstrap = () => platformBrowserDynamic()
})
}
+ if (!environment.production) {
+ const applicationRef = bootstrapModule.injector.get(ApplicationRef)
+ const componentRef = applicationRef.components[0]
+
+ // allows to run `ng.profiler.timeChangeDetection();`
+ enableDebugTools(componentRef)
+ }
+
return bootstrapModule
})
.catch(err => {