From 421d935d256db5b77a652d8da0c9a38cb57147ba Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 27 Aug 2019 17:09:43 +0200 Subject: Add about information in registration page --- .../about-instance/about-instance.component.ts | 31 +++++----------------- 1 file changed, 7 insertions(+), 24 deletions(-) (limited to 'client/src/app/+about/about-instance') diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts index 0af1dca9c..e2c448501 100644 --- a/client/src/app/+about/about-instance/about-instance.component.ts +++ b/client/src/app/+about/about-instance/about-instance.component.ts @@ -6,7 +6,6 @@ import { InstanceService } from '@app/shared/instance/instance.service' import { MarkdownService } from '@app/shared/renderer' import { forkJoin } from 'rxjs' import { first } from 'rxjs/operators' -import { peertubeTranslate } from '@shared/models' @Component({ selector: 'my-about-instance', @@ -59,32 +58,16 @@ export class AboutInstanceComponent implements OnInit { this.serverService.videoLanguagesLoaded.pipe(first()), this.serverService.videoCategoriesLoaded.pipe(first()) ]).subscribe( - async ([ res, translations ]) => { - this.shortDescription = res.instance.shortDescription + async ([ about, translations ]) => { + this.shortDescription = about.instance.shortDescription - this.maintenanceLifetime = res.instance.maintenanceLifetime - this.businessModel = res.instance.businessModel + this.maintenanceLifetime = about.instance.maintenanceLifetime + this.businessModel = about.instance.businessModel - for (const key of [ 'description', 'terms', 'codeOfConduct', 'moderationInformation', 'administrator' ]) { - this.html[ key ] = await this.markdownService.textMarkdownToHTML(res.instance[ key ]) - } + this.html = await this.instanceService.buildHtml(about) - const languagesArray = this.serverService.getVideoLanguages() - const categoriesArray = this.serverService.getVideoCategories() - - this.languages = res.instance.languages - .map(l => { - const languageObj = languagesArray.find(la => la.id === l) - - return peertubeTranslate(languageObj.label, translations) - }) - - this.categories = res.instance.categories - .map(c => { - const categoryObj = categoriesArray.find(ca => ca.id === c) - - return peertubeTranslate(categoryObj.label, translations) - }) + this.languages = this.instanceService.buildTranslatedLanguages(about, translations) + this.categories = this.instanceService.buildTranslatedCategories(about, translations) }, () => this.notifier.error(this.i18n('Cannot get about information from server')) -- cgit v1.2.3