X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.html;h=f28134ece2a1615075cb181e0401cdde2bacfc98;hb=30eac84e71eeb99e70861e5ab75c60fd39dac03c;hp=11b9fb8d0e6fac26a463adfc0938bb828cbd14db;hpb=4001b3bc6c6e8bcd7a2076c6d654a258fe656548;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 11b9fb8d0..f28134ece 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -1,10 +1,15 @@
 <div class="row">
   <!-- We need the video container for videojs so we just hide it -->
-  <div [hidden]="videoNotFound" id="video-container">
-     <video [poster]="getVideoPoster()" id="video-element" class="video-js vjs-peertube-skin"></video>
+  <div id="video-element-wrapper">
   </div>
 
-  <div *ngIf="videoNotFound" id="video-not-found">Video not found :'(</div>
+  <div i18n class="alert alert-warning" *ngIf="isVideoToTranscode()">
+    The video is being transcoded, it may not work properly.
+  </div>
+
+  <div i18n class="alert alert-info" *ngIf="hasVideoScheduledPublication()">
+    This video will be published on {{ video.scheduledUpdate.updateAt | date: 'full' }}
+  </div>
 
   <!-- Video information -->
   <div *ngIf="video" class="margin-content video-bottom">
@@ -13,18 +18,25 @@
         <div>
           <div class="video-info-name">{{ video.name }}</div>
 
-          <div class="video-info-date-views">
-            {{ video.createdAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
+          <div i18n class="video-info-date-views">
+            {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
           </div>
 
           <div class="video-info-channel">
-            {{ video.channel.displayName }}
+            <a [routerLink]="[ '/video-channels', video.channel.uuid ]" i18n-title title="Go the channel page">
+              {{ video.channel.displayName }}
+
+              <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
+            </a>
             <!-- 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.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 class="video-info-by">
-            By {{ video.by }}
-            <img [src]="getAvatarPath()" alt="Account avatar" />
+            <a [routerLink]="[ '/accounts', video.by ]" i18n-title title="Go to the account page">
+              <span i18n>By {{ video.by }}</span>
+              <img [src]="video.accountAvatarUrl" alt="Account avatar" />
+            </a>
           </div>
         </div>
 
@@ -34,24 +46,24 @@
                 *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
                 class="action-button action-button-like"
             >
-              <span class="icon icon-like" title="Like this video" ></span>
+              <span class="icon icon-like" i18n-title title="Like this video" ></span>
             </div>
 
             <div
                 *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
                 class="action-button action-button-dislike"
             >
-              <span class="icon icon-dislike" title="Dislike this video"></span>
+              <span class="icon icon-dislike" i18n-title title="Dislike this video"></span>
             </div>
 
             <div *ngIf="video.support" (click)="showSupportModal()" class="action-button action-button-support">
               <span class="icon icon-support"></span>
-              <span class="icon-text">Support</span>
+              <span class="icon-text" i18n>Support</span>
             </div>
 
             <div (click)="showShareModal()" class="action-button action-button-share">
               <span class="icon icon-share"></span>
-              <span class="icon-text">Share</span>
+              <span class="icon-text" i18n>Share</span>
             </div>
 
             <div class="action-more" dropdown dropup="true" placement="right">
@@ -61,32 +73,32 @@
 
               <ul *dropdownMenu class="dropdown-menu" id="more-menu" role="menu" aria-labelledby="single-button">
                 <li role="menuitem">
-                  <a class="dropdown-item" title="Download the video" href="#" (click)="showDownloadModal($event)">
-                    <span class="icon icon-download"></span> Download
+                  <a class="dropdown-item" i18n-title title="Download the video" href="#" (click)="showDownloadModal($event)">
+                    <span class="icon icon-download"></span> <ng-container i18n>Download</ng-container>
                   </a>
                 </li>
 
                 <li *ngIf="isUserLoggedIn()" role="menuitem">
-                  <a class="dropdown-item" title="Report this video" href="#" (click)="showReportModal($event)">
-                    <span class="icon icon-alert"></span> Report
+                  <a class="dropdown-item" i18n-title title="Report this video" href="#" (click)="showReportModal($event)">
+                    <span class="icon icon-alert"></span> <ng-container i18n>Report</ng-container>
                   </a>
                 </li>
 
                 <li *ngIf="isVideoBlacklistable()" role="menuitem">
-                  <a class="dropdown-item" title="Blacklist this video" href="#" (click)="blacklistVideo($event)">
-                    <span class="icon icon-blacklist"></span> Blacklist
+                  <a class="dropdown-item" i18n-title title="Blacklist this video" href="#" (click)="blacklistVideo($event)">
+                    <span class="icon icon-blacklist"></span> <ng-container i18n>Blacklist</ng-container>
                   </a>
                 </li>
 
                 <li *ngIf="isVideoUpdatable()" role="menuitem">
-                  <a class="dropdown-item" title="Update this video" href="#" [routerLink]="[ '/videos/edit', video.uuid ]">
-                    <span class="icon icon-edit"></span> Update
+                  <a class="dropdown-item" i18n-title title="Update this video" href="#" [routerLink]="[ '/videos/update', video.uuid ]">
+                    <span class="icon icon-edit"></span> <ng-container i18n>Update</ng-container>
                   </a>
                 </li>
 
                 <li *ngIf="isVideoRemovable()" role="menuitem">
-                  <a class="dropdown-item" title="Delete this video" href="#" (click)="removeVideo($event)">
-                    <span class="icon icon-blacklist"></span> Delete
+                  <a class="dropdown-item" i18n-title title="Delete this video" href="#" (click)="removeVideo($event)">
+                    <span class="icon icon-blacklist"></span> <ng-container i18n>Delete</ng-container>
                   </a>
                 </li>
               </ul>
@@ -105,56 +117,56 @@
         <div class="video-info-description-html" [innerHTML]="videoHTMLDescription"></div>
 
         <div class="video-info-description-more" *ngIf="completeDescriptionShown === false && video.description?.length >= 250" (click)="showMoreDescription()">
-          Show more
+          <ng-container i18n>Show more</ng-container>
           <span *ngIf="descriptionLoading === false" class="glyphicon glyphicon-menu-down"></span>
           <my-loader class="description-loading" [loading]="descriptionLoading"></my-loader>
         </div>
 
         <div *ngIf="completeDescriptionShown === true" (click)="showLessDescription()" class="video-info-description-more">
-          Show less
+          <ng-container i18n>Show less</ng-container>
           <span *ngIf="descriptionLoading === false" class="glyphicon glyphicon-menu-up"></span>
         </div>
       </div>
 
       <div class="video-attributes">
         <div class="video-attribute">
-          <span class="video-attribute-label">
+          <span i18n class="video-attribute-label">
             Privacy
           </span>
           <span class="video-attribute-value">
-            {{ video.privacyLabel }}
+            {{ video.privacy.label }}
           </span>
         </div>
 
         <div class="video-attribute">
-          <span class="video-attribute-label">
+          <span i18n class="video-attribute-label">
             Category
           </span>
           <span class="video-attribute-value">
-            {{ video.categoryLabel }}
+            {{ video.category.label }}
           </span>
         </div>
 
         <div class="video-attribute">
-          <span class="video-attribute-label">
+          <span i18n class="video-attribute-label">
             Licence
           </span>
           <span class="video-attribute-value">
-            {{ video.licenceLabel }}
+            {{ video.licence.label }}
           </span>
         </div>
 
         <div class="video-attribute">
-          <span class="video-attribute-label">
+          <span i18n class="video-attribute-label">
             Language
           </span>
           <span class="video-attribute-value">
-            {{ video.languageLabel }}
+            {{ video.language.label }}
           </span>
         </div>
 
         <div class="video-attribute">
-          <span class="video-attribute-label">
+          <span i18n class="video-attribute-label">
             Tags
           </span>
 
@@ -168,7 +180,7 @@
     </div>
 
     <div class="other-videos">
-      <div class="title-page title-page-single">
+      <div i18n class="title-page title-page-single">
         Other videos
       </div>
 
@@ -177,6 +189,21 @@
       </div>
     </div>
   </div>
+
+
+  <div class="privacy-concerns" *ngIf="hasAlreadyAcceptedPrivacyConcern === false">
+    <strong i18n>Friendly Reminder:</strong>
+    <div class="privacy-concerns-text">
+      <ng-container i18n>
+        The sharing system used by this video implies that some technical information about your system (such as a public IP address) can be sent to other peers.
+      </ng-container>
+      <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube">More information</a>
+    </div>
+
+    <div i18n class="privacy-concerns-okay" (click)="acceptedPrivacyConcern()">
+      OK
+    </div>
+  </div>
 </div>
 
 <ng-template [ngIf]="video !== null">