OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

fixing #595 by using the account name instead of the displayName

pull/636/head
Rigel Kent 2018-06-07 11:28:53 +02:00 committed by Chocobozzz
parent 46659d01df
commit 9e32b99c20
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/app/videos/+video-watch/comment/video-comments.component.html
View File

@ -3,10 +3,9 @@
<div i18n class="title-page title-page-single"> <div i18n class="title-page title-page-single">
Comments Comments
</div> </div>
<my-help <my-help
*ngIf="video.commentsEnabled === true" helpType="custom" i18n-customHtml *ngIf="video.commentsEnabled === true" helpType="custom" i18n-customHtml
customHtml="You can either comment on the page of your instance where this video is federated with your PeerTube account, or via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.displayName}}@{{video.account.host}}</strong> and find back the video. Direct commenting capabilities are being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/224'>#224</a>." customHtml="You can either comment on the page of your instance where this video is federated with your PeerTube account, or via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and find back the video. Direct commenting capabilities are being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/224'>#224</a>."></my-help>
></my-help>
</div> </div>
<ng-template [ngIf]="video.commentsEnabled === true"> <ng-template [ngIf]="video.commentsEnabled === true">

4
client/src/app/videos/+video-watch/video-watch.component.html
View File

@ -21,11 +21,11 @@
{{ video.channel.displayName }} {{ video.channel.displayName }}
</a> </a>
<!-- Here will be the subscribe button --> <!-- Here will be the subscribe button -->
<my-help helpType="custom" i18n-customHtml customHtml="You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.displayName}}@{{video.account.host}}</strong> and subscribe there. Subscription as a PeerTube user is being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/470'>#470</a>."></my-help> <my-help helpType="custom" i18n-customHtml customHtml="You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and subscribe there. Subscription as a PeerTube user is being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/470'>#470</a>."></my-help>
</div> </div>
<div class="video-info-by"> <div class="video-info-by">
<a [routerLink]="[ '/accounts', video.by ]" i18n-title title="Go the account page"> <a [routerLink]="[ '/accounts', video.by ]" i18n-title title="Go to the account page">
<span i18n>By {{ video.by }}</span> <span i18n>By {{ video.by }}</span>
<img [src]="video.accountAvatarUrl" alt="Account avatar" /> <img [src]="video.accountAvatarUrl" alt="Account avatar" />
</a> </a>