X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Baccounts%2Faccount-about%2Faccount-about.component.ts;h=2acf67a59ae85909159fd0fb80e46afafea181c4;hb=53055a1124cbc2eaeeeeef21b19b0b46e96f23c5;hp=f063df392624651f608f2e9d2400836235ba9d0a;hpb=db400f447a9f7aae1c56fa25396e93069744483f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+accounts/account-about/account-about.component.ts b/client/src/app/+accounts/account-about/account-about.component.ts index f063df392..2acf67a59 100644 --- a/client/src/app/+accounts/account-about/account-about.component.ts +++ b/client/src/app/+accounts/account-about/account-about.component.ts @@ -1,30 +1,45 @@ -import { Component, OnInit } from '@angular/core' +import { Component, OnInit, OnDestroy } from '@angular/core' import { ActivatedRoute } from '@angular/router' import { Account } from '@app/shared/account/account.model' import { AccountService } from '@app/shared/account/account.service' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { Subscription } from 'rxjs' +import { MarkdownService } from '@app/videos/shared' @Component({ selector: 'my-account-about', templateUrl: './account-about.component.html', styleUrls: [ './account-about.component.scss' ] }) -export class AccountAboutComponent implements OnInit { +export class AccountAboutComponent implements OnInit, OnDestroy { account: Account + descriptionHTML = '' + + private accountSub: Subscription constructor ( - protected route: ActivatedRoute, - private accountService: AccountService + private route: ActivatedRoute, + private i18n: I18n, + private accountService: AccountService, + private markdownService: MarkdownService ) { } ngOnInit () { // Parent get the account for us - this.accountService.accountLoaded - .subscribe(account => this.account = account) + this.accountSub = this.accountService.accountLoaded + .subscribe(account => { + this.account = account + this.descriptionHTML = this.markdownService.textMarkdownToHTML(this.account.description) + }) + } + + ngOnDestroy () { + if (this.accountSub) this.accountSub.unsubscribe() } getAccountDescription () { - if (this.account.description) return this.account.description + if (this.descriptionHTML) return this.descriptionHTML - return 'No description' + return this.i18n('No description') } }