11 files changed, 63 insertions, 48 deletions

diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
index 54d7286db..eaf068cfa 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
@@ -3,7 +3,7 @@
     <img [src]="user.accountAvatarUrl" alt="Avatar" />
 
     <div class="form-group">
-      <textarea placeholder="Add comment..." formControlName="text" [ngClass]="{ 'input-error': formErrors['text'] }"
+      <textarea i18n-placeholder placeholder="Add comment..." formControlName="text" [ngClass]="{ 'input-error': formErrors['text'] }"
                 (keyup.control.enter)="onValidKey()" (keyup.meta.enter)="onValidKey()" #textarea>
 
       </textarea>
@@ -14,7 +14,7 @@
   </div>
 
   <div class="submit-comment">
-    <button *ngIf="isAddButtonDisplayed()" [ngClass]="{ disabled: !form.valid }">
+    <button *ngIf="isAddButtonDisplayed()" [ngClass]="{ disabled: !form.valid }" i18n>
       Post comment
     </button>
   </div>
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
index b1f446475..2ee5f5ef1 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
@@ -9,6 +9,7 @@ import { User } from '../../../shared/users'
 import { Video } from '../../../shared/video/video.model'
 import { VideoComment } from './video-comment.model'
 import { VideoCommentService } from './video-comment.service'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
   selector: 'my-video-comment-add',
@@ -37,7 +38,8 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit {
   constructor (
     private formBuilder: FormBuilder,
     private notificationsService: NotificationsService,
-    private videoCommentService: VideoCommentService
+    private videoCommentService: VideoCommentService,
+    private i18n: I18n
   ) {
     super()
   }
@@ -92,7 +94,7 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit {
         this.form.reset()
       },
 
-      err => this.notificationsService.error('Error', err.text)
+      err => this.notificationsService.error(this.i18n('Error'), err.text)
     )
   }
 
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.html b/client/src/app/videos/+video-watch/comment/video-comment.component.html
index 06808ef80..60b803206 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comment.component.html
@@ -2,7 +2,7 @@
   <img [src]="comment.accountAvatarUrl" alt="Avatar" />
 
   <div class="comment">
-    <div *ngIf="highlightedComment === true" class="highlighted-comment">Highlighted comment</div>
+    <div *ngIf="highlightedComment === true" class="highlighted-comment" i18n>Highlighted comment</div>
 
     <div class="comment-account-date">
       <a [href]="comment.account.url"  target="_blank" rel="noopener noreferrer" class="comment-account">{{ comment.by }}</a>
@@ -11,8 +11,8 @@
     <div class="comment-html" [innerHTML]="sanitizedCommentHTML"></div>
 
     <div class="comment-actions">
-      <div *ngIf="isUserLoggedIn()" (click)="onWantToReply()" class="comment-action-reply">Reply</div>
-      <div *ngIf="isRemovableByUser()" (click)="onWantToDelete()" class="comment-action-delete">Delete</div>
+      <div *ngIf="isUserLoggedIn()" (click)="onWantToReply()" class="comment-action-reply" i18n>Reply</div>
+      <div *ngIf="isRemovableByUser()" (click)="onWantToDelete()" class="comment-action-delete" i18n>Delete</div>
     </div>
 
     <my-video-comment-add
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.html b/client/src/app/videos/+video-watch/comment/video-comments.component.html
index 114a56dc7..ac7c03648 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.html
@@ -3,7 +3,10 @@
     <div class="title-page title-page-single">
       Comments
     </div>
-    <my-help *ngIf="video.commentsEnabled === true" helpType="custom" 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>."></my-help>
+    <my-help
+      *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>."
+    ></my-help>
   </div>
 
   <ng-template [ngIf]="video.commentsEnabled === true">
@@ -14,7 +17,7 @@
       (commentCreated)="onCommentThreadCreated($event)"
     ></my-video-comment-add>
 
-    <div *ngIf="componentPagination.totalItems === 0 && comments.length === 0">No comments.</div>
+    <div *ngIf="componentPagination.totalItems === 0 && comments.length === 0" i18n>No comments.</div>
 
     <div
       class="comment-threads"
@@ -24,15 +27,15 @@
     >
       <div *ngIf="highlightedThread" id="highlighted-comment">
         <my-video-comment
-            [comment]="highlightedThread"
-            [video]="video"
-            [inReplyToCommentId]="inReplyToCommentId"
-            [commentTree]="threadComments[highlightedThread.id]"
-            [highlightedComment]="true"
-            (wantedToReply)="onWantedToReply($event)"
-            (wantedToDelete)="onWantedToDelete($event)"
-            (threadCreated)="onThreadCreated($event)"
-            (resetReply)="onResetReply()"
+          [comment]="highlightedThread"
+          [video]="video"
+          [inReplyToCommentId]="inReplyToCommentId"
+          [commentTree]="threadComments[highlightedThread.id]"
+          [highlightedComment]="true"
+          (wantedToReply)="onWantedToReply($event)"
+          (wantedToDelete)="onWantedToDelete($event)"
+          (threadCreated)="onThreadCreated($event)"
+          (resetReply)="onResetReply()"
         ></my-video-comment>
       </div>
 
@@ -50,7 +53,7 @@
         ></my-video-comment>
 
         <div *ngIf="comment.totalReplies !== 0 && !threadComments[comment.id]" (click)="viewReplies(comment.id)" class="view-replies">
-          View all {{ comment.totalReplies }} replies
+          <ng-container i18n>View all {{ comment.totalReplies }} replies</ng-container>
 
           <span *ngIf="!threadLoading[comment.id]" class="glyphicon glyphicon-menu-down"></span>
           <my-loader class="comment-thread-loading" [loading]="threadLoading[comment.id]"></my-loader>
@@ -59,7 +62,7 @@
     </div>
   </ng-template>
 
-  <div *ngIf="video.commentsEnabled === false">
+  <div *ngIf="video.commentsEnabled === false" i18n>
     Comments are disabled.
   </div>
 </div>
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
index 34f4a0701..8c6ddb89e 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
@@ -11,6 +11,7 @@ import { VideoSortField } from '../../../shared/video/sort-field.type'
 import { VideoDetails } from '../../../shared/video/video-details.model'
 import { VideoComment } from './video-comment.model'
 import { VideoCommentService } from './video-comment.service'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
   selector: 'my-video-comments',
@@ -40,7 +41,8 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
     private notificationsService: NotificationsService,
     private confirmService: ConfirmService,
     private videoCommentService: VideoCommentService,
-    private activatedRoute: ActivatedRoute
+    private activatedRoute: ActivatedRoute,
+    private i18n: I18n
   ) {}
 
   ngOnInit () {
@@ -77,7 +79,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
           if (highlightThread) this.highlightedThread = new VideoComment(res.comment)
         },
 
-        err => this.notificationsService.error('Error', err.message)
+        err => this.notificationsService.error(this.i18n('Error'), err.message)
       )
   }
 
@@ -89,7 +91,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
           this.componentPagination.totalItems = res.totalComments
         },
 
-        err => this.notificationsService.error('Error', err.message)
+        err => this.notificationsService.error(this.i18n('Error'), err.message)
       )
   }
 
@@ -111,9 +113,11 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
 
   async onWantedToDelete (commentToDelete: VideoComment) {
     let message = 'Do you really want to delete this comment?'
-    if (commentToDelete.totalReplies !== 0) message += `${commentToDelete.totalReplies} would be deleted too.`
+    if (commentToDelete.totalReplies !== 0) {
+      message += this.i18n(' {{ totalReplies }} replies will be deleted too.', { totalReplies: commentToDelete.totalReplies })
+    }
 
-    const res = await this.confirmService.confirm(message, 'Delete')
+    const res = await this.confirmService.confirm(message, this.i18n('Delete'))
     if (res === false) return
 
     this.videoCommentService.deleteVideoComment(commentToDelete.videoId, commentToDelete.id)
@@ -136,7 +140,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
           this.componentPagination.totalItems--
         },
 
-        err => this.notificationsService.error('Error', err.message)
+        err => this.notificationsService.error(this.i18n('Error'), err.message)
       )
   }
 
diff --git a/client/src/app/videos/+video-watch/modal/video-download.component.html b/client/src/app/videos/+video-watch/modal/video-download.component.html
index 617892b11..d30a49345 100644
--- a/client/src/app/videos/+video-watch/modal/video-download.component.html
+++ b/client/src/app/videos/+video-watch/modal/video-download.component.html
@@ -4,7 +4,7 @@
 
       <div class="modal-header">
         <span class="close" aria-hidden="true" (click)="hide()"></span>
-        <h4 class="modal-title">Download video</h4>
+        <h4 i18n class="modal-title">Download video</h4>
       </div>
 
       <div class="modal-body">
@@ -17,22 +17,22 @@
         <div class="download-type">
           <div class="peertube-radio-container">
             <input type="radio" name="download" id="download-torrent" [(ngModel)]="downloadType" value="torrent">
-            <label for="download-torrent">Torrent</label>
+            <label i18n for="download-torrent">Torrent</label>
           </div>
 
           <div class="peertube-radio-container">
             <input type="radio" name="download" id="download-direct" [(ngModel)]="downloadType" value="direct">
-            <label for="download-direct">Direct download</label>
+            <label i18n for="download-direct">Direct download</label>
           </div>
         </div>
 
         <div class="form-group inputs">
-          <span class="action-button action-button-cancel" (click)="hide()">
+          <span i18n class="action-button action-button-cancel" (click)="hide()">
             Cancel
           </span>
 
           <input
-            type="submit" value="Download" class="action-button-submit"
+            type="submit" i18n-value value="Download" class="action-button-submit"
             (click)="download()"
           >
         </div>
diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.html b/client/src/app/videos/+video-watch/modal/video-report.component.html
index a9a7beb48..4ee3721fb 100644
--- a/client/src/app/videos/+video-watch/modal/video-report.component.html
+++ b/client/src/app/videos/+video-watch/modal/video-report.component.html
@@ -4,14 +4,14 @@
 
       <div class="modal-header">
         <span class="close" aria-hidden="true" (click)="hide()"></span>
-        <h4 class="modal-title">Report video</h4>
+        <h4 i18n class="modal-title">Report video</h4>
       </div>
 
       <div class="modal-body">
 
         <form novalidate [formGroup]="form" (ngSubmit)="report()">
           <div class="form-group">
-            <textarea placeholder="Reason..." formControlName="reason" [ngClass]="{ 'input-error': formErrors['reason'] }">
+            <textarea i18n-placeholder placeholder="Reason..." formControlName="reason" [ngClass]="{ 'input-error': formErrors['reason'] }">
             </textarea>
             <div *ngIf="formErrors.reason" class="form-error">
               {{ formErrors.reason }}
@@ -19,12 +19,12 @@
           </div>
 
           <div class="form-group inputs">
-            <span class="action-button action-button-cancel" (click)="hide()">
+            <span i18n class="action-button action-button-cancel" (click)="hide()">
               Cancel
             </span>
 
             <input
-              type="submit" value="Submit" class="action-button-submit"
+              type="submit" i18n-value value="Submit" class="action-button-submit"
               [disabled]="!form.valid"
             >
           </div>
diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.ts b/client/src/app/videos/+video-watch/modal/video-report.component.ts
index 050e827e7..1bbd30226 100644
--- a/client/src/app/videos/+video-watch/modal/video-report.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-report.component.ts
@@ -4,6 +4,7 @@ import { NotificationsService } from 'angular2-notifications'
 import { ModalDirective } from 'ngx-bootstrap/modal'
 import { FormReactive, VIDEO_ABUSE_REASON, VideoAbuseService } from '../../../shared/index'
 import { VideoDetails } from '../../../shared/video/video-details.model'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
   selector: 'my-video-report',
@@ -27,8 +28,9 @@ export class VideoReportComponent extends FormReactive implements OnInit {
   constructor (
     private formBuilder: FormBuilder,
     private videoAbuseService: VideoAbuseService,
-    private notificationsService: NotificationsService
-   ) {
+    private notificationsService: NotificationsService,
+    private i18n: I18n
+  ) {
     super()
   }
 
@@ -58,11 +60,11 @@ export class VideoReportComponent extends FormReactive implements OnInit {
     this.videoAbuseService.reportVideo(this.video.id, reason)
                           .subscribe(
                             () => {
-                              this.notificationsService.success('Success', 'Video reported.')
+                              this.notificationsService.success(this.i18n('Success'), this.i18n('Video reported.'))
                               this.hide()
                             },
 
-                            err => this.notificationsService.error('Error', err.message)
+                            err => this.notificationsService.error(this.i18n('Error'), err.message)
                            )
   }
 }
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.html b/client/src/app/videos/+video-watch/modal/video-share.component.html
index 85cf10a6c..26ab5144a 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.html
+++ b/client/src/app/videos/+video-watch/modal/video-share.component.html
@@ -4,12 +4,12 @@
 
       <div class="modal-header">
         <span class="close" aria-hidden="true" (click)="hide()"></span>
-        <h4 class="modal-title">Share</h4>
+        <h4 i18n class="modal-title">Share</h4>
       </div>
 
       <div class="modal-body">
         <div class="form-group">
-          <label>URL</label>
+          <label i18n>URL</label>
           <div class="input-group input-group-sm">
             <input #urlInput (click)="urlInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getVideoUrl()" />
             <div class="input-group-btn" placement="bottom right">
@@ -21,7 +21,7 @@
         </div>
 
         <div class="form-group">
-          <label>Embed</label>
+          <label i18n>Embed</label>
           <div class="input-group input-group-sm">
             <input #shareInput (click)="shareInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getVideoIframeCode()" />
             <div class="input-group-btn" placement="bottom right">
@@ -32,12 +32,12 @@
           </div>
         </div>
 
-        <div *ngIf="notSecure()" class="alert alert-warning">
+        <div i18n *ngIf="notSecure()" class="alert alert-warning">
           The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites).
         </div>
 
         <div class="form-group inputs">
-          <span class="action-button action-button-cancel" (click)="hide()">
+          <span i18n class="action-button action-button-cancel" (click)="hide()">
             Cancel
           </span>
         </div>
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.ts b/client/src/app/videos/+video-watch/modal/video-share.component.ts
index 33998c5d8..5c988a43b 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-share.component.ts
@@ -5,6 +5,7 @@ import { NotificationsService } from 'angular2-notifications'
 import { ModalDirective } from 'ngx-bootstrap/modal'
 import { VideoDetails } from '../../../shared/video/video-details.model'
 import { buildVideoEmbed } from '../../../../assets/player/utils'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
   selector: 'my-video-share',
@@ -16,7 +17,10 @@ export class VideoShareComponent {
 
   @ViewChild('modal') modal: ModalDirective
 
-  constructor (private notificationsService: NotificationsService) {
+  constructor (
+    private notificationsService: NotificationsService,
+    private i18n: I18n
+  ) {
     // empty
   }
 
@@ -41,6 +45,6 @@ export class VideoShareComponent {
   }
 
   activateCopiedMessage () {
-    this.notificationsService.success('Success', 'Copied')
+    this.notificationsService.success(this.i18n('Success'), this.i18n('Copied'))
   }
 }
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.html b/client/src/app/videos/+video-watch/modal/video-support.component.html
index 16ad9502a..9bcfcea47 100644
--- a/client/src/app/videos/+video-watch/modal/video-support.component.html
+++ b/client/src/app/videos/+video-watch/modal/video-support.component.html
@@ -4,7 +4,7 @@
 
       <div class="modal-header">
         <span class="close" aria-hidden="true" (click)="hide()"></span>
-        <h4 class="modal-title">Support</h4>
+        <h4 i18n class="modal-title">Support</h4>
       </div>
 
       <div class="modal-body">
@@ -12,7 +12,7 @@
         <div [innerHTML]="videoHTMLSupport"></div>
 
         <div class="form-group inputs">
-          <span class="action-button action-button-cancel" (click)="hide()">
+          <span i18n class="action-button action-button-cancel" (click)="hide()">
             Cancel
           </span>
         </div>