Fix player resolution change that plays even if the video was paused

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

diff --git a/client/src/app/about/about.component.ts b/client/src/app/about/about.component.ts
index 6a2e59be18476b7762ddadffbdb30859e27cafff..c37b9318bef21ad23b1836fad39aca9fb79d2a37 100644 (file)
--- a/client/src/app/about/about.component.ts
+++ b/client/src/app/about/about.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'
 import { ServerService } from '@app/core'
 import { MarkdownService } from '@app/videos/shared'
 import { NotificationsService } from 'angular2-notifications'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
   selector: 'my-about',
@@ -10,28 +11,39 @@ import { NotificationsService } from 'angular2-notifications'
 })
 
 export class AboutComponent implements OnInit {
+  shortDescription = ''
   descriptionHTML = ''
   termsHTML = ''
 
   constructor (
     private notificationsService: NotificationsService,
     private serverService: ServerService,
-    private markdownService: MarkdownService
+    private markdownService: MarkdownService,
+    private i18n: I18n
   ) {}
 
   get instanceName () {
     return this.serverService.getConfig().instance.name
   }
 
+  get userVideoQuota () {
+    return this.serverService.getConfig().user.videoQuota
+  }
+
+  get isSignupAllowed () {
+    return this.serverService.getConfig().signup.allowed
+  }
+
   ngOnInit () {
     this.serverService.getAbout()
       .subscribe(
         res => {
-          this.descriptionHTML = this.markdownService.markdownToHTML(res.instance.description)
-          this.termsHTML = this.markdownService.markdownToHTML(res.instance.terms)
+          this.shortDescription = res.instance.shortDescription
+          this.descriptionHTML = this.markdownService.textMarkdownToHTML(res.instance.description)
+          this.termsHTML = this.markdownService.textMarkdownToHTML(res.instance.terms)
         },
 
-        err => this.notificationsService.error('Error', err)
+        err => this.notificationsService.error(this.i18n('Error getting about from server'), err)
       )
   }