21 files changed, 126 insertions, 104 deletions

diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html
index 7e1be4467..bd9f69362 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html
@@ -4,7 +4,7 @@
     <tab heading="Basic info">
       <div class="col-md-8">
         <div class="form-group">
-          <label for="name">Title</label>
+          <label i18n for="name">Title</label>
           <input type="text" id="name" formControlName="name" />
           <div *ngIf="formErrors.name" class="form-error">
             {{ formErrors.name }}
@@ -12,7 +12,7 @@
         </div>
 
         <div class="form-group">
-          <label class="label-tags">Tags</label> <span>(press Enter to add)</span>
+          <label i18n class="label-tags">Tags</label> <span i18n>(press Enter to add)</span>
           <tag-input
             [validators]="tagValidators" [errorMessages]="tagValidatorsMessages"
             formControlName="tags" maxItems="5" modelAsStrings="true"
@@ -20,8 +20,8 @@
         </div>
 
         <div class="form-group">
-          <label for="description">Description</label>
-          <my-help helpType="markdownText" preHtml="Video descriptions are truncated by default and require manual action to expand them."></my-help>
+          <label i18n for="description">Description</label>
+          <my-help helpType="markdownText" i18n-preHtml preHtml="Video descriptions are truncated by default and require manual action to expand them."></my-help>
           <my-markdown-textarea truncate="250" formControlName="description"></my-markdown-textarea>
 
           <div *ngIf="formErrors.description" class="form-error">
@@ -32,7 +32,7 @@
 
       <div class="col-md-4">
         <div class="form-group">
-          <label>Channel</label>
+          <label i18n>Channel</label>
           <div class="peertube-select-container">
             <select formControlName="channelId">
               <option *ngFor="let channel of userVideoChannels" [value]="channel.id">{{ channel.label }}</option>
@@ -41,7 +41,7 @@
         </div>
 
         <div class="form-group">
-          <label for="category">Category</label>
+          <label i18n for="category">Category</label>
           <div class="peertube-select-container">
             <select id="category" formControlName="category">
               <option></option>
@@ -55,7 +55,7 @@
         </div>
 
         <div class="form-group">
-          <label for="licence">Licence</label>
+          <label i18n for="licence">Licence</label>
           <div class="peertube-select-container">
             <select id="licence" formControlName="licence">
               <option></option>
@@ -69,7 +69,7 @@
         </div>
 
         <div class="form-group">
-          <label for="language">Language</label>
+          <label i18n for="language">Language</label>
           <div class="peertube-select-container">
             <select id="language" formControlName="language">
               <option></option>
@@ -83,7 +83,7 @@
         </div>
 
         <div class="form-group">
-          <label for="privacy">Privacy</label>
+          <label i18n for="privacy">Privacy</label>
           <div class="peertube-select-container">
             <select id="privacy" formControlName="privacy">
               <option></option>
@@ -99,14 +99,14 @@
         <div class="form-group form-group-checkbox">
           <input type="checkbox" id="nsfw" formControlName="nsfw" />
           <label for="nsfw"></label>
-          <label for="nsfw">This video contains mature or explicit content</label>
-          <my-help tooltipPlacement="top" helpType="custom" customHtml="Some instances do not list NSFW videos by default."></my-help>
+          <label i18n for="nsfw">This video contains mature or explicit content</label>
+          <my-help tooltipPlacement="top" helpType="custom" i18n-customHtml customHtml="Some instances do not list NSFW videos by default."></my-help>
         </div>
 
         <div class="form-group form-group-checkbox">
           <input type="checkbox" id="commentsEnabled" formControlName="commentsEnabled" />
           <label for="commentsEnabled"></label>
-          <label for="commentsEnabled">Enable video comments</label>
+          <label i18n for="commentsEnabled">Enable video comments</label>
         </div>
 
       </div>
@@ -116,24 +116,24 @@
       <div class="col-md-12 advanced-settings">
         <div class="form-group">
           <my-video-image
-            inputLabel="Upload thumbnail" inputName="thumbnailfile" formControlName="thumbnailfile"
+            i18n-inputLabel inputLabel="Upload thumbnail" inputName="thumbnailfile" formControlName="thumbnailfile"
             previewWidth="200px" previewHeight="110px"
           ></my-video-image>
         </div>
 
         <div class="form-group">
           <my-video-image
-            inputLabel="Upload preview" inputName="previewfile" formControlName="previewfile"
+            i18n-inputLabel inputLabel="Upload preview" inputName="previewfile" formControlName="previewfile"
             previewWidth="360px" previewHeight="200px"
           ></my-video-image>
         </div>
 
         <div class="form-group">
-          <label for="support">Support</label>
-          <my-help helpType="markdownEnhanced" preHtml="Short text to tell people how they can support you (membership platform...)."></my-help>
+          <label i18n for="support">Support</label>
+          <my-help helpType="markdownEnhanced" i18n-preHtml preHtml="Short text to tell people how they can support you (membership platform...)."></my-help>
           <my-markdown-textarea
-              id="support" formControlName="support" textareaWidth="500px" [previewColumn]="true" markdownType="enhanced"
-              [classes]="{ 'input-error': formErrors['support'] }"
+            id="support" formControlName="support" textareaWidth="500px" [previewColumn]="true" markdownType="enhanced"
+            [classes]="{ 'input-error': formErrors['support'] }"
           ></my-markdown-textarea>
           <div *ngIf="formErrors.support" class="form-error">
             {{ formErrors.support }}
diff --git a/client/src/app/videos/+video-edit/shared/video-image.component.html b/client/src/app/videos/+video-edit/shared/video-image.component.html
index 5d0624f8c..e319d7ee7 100644
--- a/client/src/app/videos/+video-edit/shared/video-image.component.html
+++ b/client/src/app/videos/+video-edit/shared/video-image.component.html
@@ -8,7 +8,7 @@
         (change)="fileChange($event)"
       />
     </div>
-    <div class="image-constraints">(extensions: {{ videoImageExtensions }}, max size: {{ maxVideoImageSize | bytes }})</div>
+    <div i18n class="image-constraints">(extensions: {{ videoImageExtensions }}, max size: {{ maxVideoImageSize | bytes }})</div>
   </div>
 
   <img *ngIf="imageSrc" [ngStyle]="{ width: previewWidth, height: previewHeight }" [src]="imageSrc" class="preview" />
diff --git a/client/src/app/videos/+video-edit/video-add.component.html b/client/src/app/videos/+video-edit/video-add.component.html
index 440556562..f00cfe016 100644
--- a/client/src/app/videos/+video-edit/video-add.component.html
+++ b/client/src/app/videos/+video-edit/video-add.component.html
@@ -1,7 +1,7 @@
 <div class="margin-content">
   <div class="title-page title-page-single">
-    <ng-template [ngIf]="!videoFileName">Upload your video</ng-template>
-    <ng-template [ngIf]="videoFileName">Upload {{ videoFileName }}</ng-template>
+    <ng-container *ngIf="!videoFileName" i18n>Upload your video</ng-container>
+    <ng-container *ngIf="videoFileName" i18n>Upload {{ videoFileName }}</ng-container>
   </div>
 
   <div *ngIf="!isUploadingVideo" class="upload-video-container">
@@ -9,12 +9,12 @@
       <div class="icon icon-upload"></div>
 
       <div class="button-file">
-        <span>Select the file to upload</span>
+        <span i18n>Select the file to upload</span>
         <input #videofileInput type="file" name="videofile" id="videofile" [accept]="videoExtensions" (change)="fileChange()" />
       </div>
 
       <div class="form-group form-group-channel">
-        <label for="first-step-channel">Channel</label>
+        <label i18n for="first-step-channel">Channel</label>
         <div class="peertube-select-container">
           <select id="first-step-channel" [(ngModel)]="firstStepChannelId">
             <option *ngFor="let channel of userVideoChannels" [value]="channel.id">{{ channel.label }}</option>
@@ -23,7 +23,7 @@
       </div>
 
       <div class="form-group">
-        <label for="first-step-privacy">Privacy</label>
+        <label i18n for="first-step-privacy">Privacy</label>
         <div class="peertube-select-container">
           <select id="first-step-privacy" [(ngModel)]="firstStepPrivacyId">
             <option *ngFor="let privacy of videoPrivacies" [value]="privacy.id">{{ privacy.label }}</option>
@@ -49,14 +49,14 @@
     ></my-video-edit>
 
     <div class="submit-container">
-      <div *ngIf="videoUploaded === false" class="message-submit">Publish will be available when upload is finished</div>
+      <div i18n *ngIf="videoUploaded === false" class="message-submit">Publish will be available when upload is finished</div>
 
       <div class="submit-button"
          (click)="updateSecondStep()"
          [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true || videoUploaded !== true }"
       >
         <span class="icon icon-validate"></span>
-        <input type="button" value="Publish" />
+        <input type="button" i18n-value value="Publish" />
       </div>
     </div>
   </form>
diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/videos/+video-edit/video-add.component.ts
index 997f033b7..a615fd92c 100644
--- a/client/src/app/videos/+video-edit/video-add.component.ts
+++ b/client/src/app/videos/+video-edit/video-add.component.ts
@@ -15,6 +15,7 @@ import { ValidatorMessage } from '../../shared/forms/form-validators/validator-m
 import { populateAsyncUserVideoChannels } from '../../shared/misc/utils'
 import { VideoEdit } from '../../shared/video/video-edit.model'
 import { VideoService } from '../../shared/video/video.service'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
   selector: 'my-videos-add',
@@ -56,7 +57,8 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy
     private userService: UserService,
     private serverService: ServerService,
     private videoService: VideoService,
-    private loadingBar: LoadingBarService
+    private loadingBar: LoadingBarService,
+    private i18n: I18n
   ) {
     super()
   }
@@ -99,10 +101,11 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy
     let text = ''
 
     if (this.videoUploaded === true) {
-      text = 'Your video was uploaded in your account and is private.' +
-        ' But associated data (tags, description...) will be lost, are you sure you want to leave this page?'
+      // FIXME: cannot concatenate strings inside i18n service :/
+      text = this.i18n('Your video was uploaded in your account and is private.') +
+        this.i18n('But associated data (tags, description...) will be lost, are you sure you want to leave this page?')
     } else {
-      text = 'Your video is not uploaded yet, are you sure you want to leave this page?'
+      text = this.i18n('Your video is not uploaded yet, are you sure you want to leave this page?')
     }
 
     return {
@@ -127,7 +130,7 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy
       this.isUploadingVideo = false
       this.videoUploadPercents = 0
       this.videoUploadObservable = null
-      this.notificationsService.info('Info', 'Upload cancelled')
+      this.notificationsService.info(this.i18n('Info'), this.i18n('Upload cancelled'))
     }
   }
 
@@ -137,7 +140,7 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy
 
     // Cannot upload videos > 4GB for now
     if (videofile.size > 4 * 1024 * 1024 * 1024) {
-      this.notificationsService.error('Error', 'We are sorry but PeerTube cannot handle videos > 4GB')
+      this.notificationsService.error(this.i18n('Error'), this.i18n('We are sorry but PeerTube cannot handle videos > 4GB'))
       return
     }
 
@@ -145,11 +148,15 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy
     if (videoQuota !== -1 && (this.userVideoQuotaUsed + videofile.size) > videoQuota) {
       const bytePipes = new BytesPipe()
 
-      const msg = 'Your video quota is exceeded with this video ' +
-        `(video size: ${bytePipes.transform(videofile.size, 0)}, ` +
-        `used: ${bytePipes.transform(this.userVideoQuotaUsed, 0)}, ` +
-        `quota: ${bytePipes.transform(videoQuota, 0)})`
-      this.notificationsService.error('Error', msg)
+      const msg = this.i18n(
+        'Your video quota is exceeded with this video (video size: {{ videoSize }}, used: {{ videoQuotaUsed }}, quota: {{ videoQuota }})',
+        {
+          videoSize: bytePipes.transform(videofile.size, 0),
+          videoQuotaUsed: bytePipes.transform(this.userVideoQuotaUsed, 0),
+          videoQuota: bytePipes.transform(videoQuota, 0)
+        }
+      )
+      this.notificationsService.error(this.i18n('Error'), msg)
       return
     }
 
@@ -192,8 +199,6 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy
         if (event.type === HttpEventType.UploadProgress) {
           this.videoUploadPercents = Math.round(100 * event.loaded / event.total)
         } else if (event instanceof HttpResponse) {
-          console.log('Video uploaded.')
-
           this.videoUploaded = true
 
           this.videoUploadedIds = event.body.video
@@ -207,7 +212,7 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy
         this.isUploadingVideo = false
         this.videoUploadPercents = 0
         this.videoUploadObservable = null
-        this.notificationsService.error('Error', err.message)
+        this.notificationsService.error(this.i18n('Error'), err.message)
       }
     )
   }
@@ -231,13 +236,13 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy
           this.isUploadingVideo = false
           this.loadingBar.complete()
 
-          this.notificationsService.success('Success', 'Video published.')
+          this.notificationsService.success(this.i18n('Success'), this.i18n('Video published.'))
           this.router.navigate([ '/videos/watch', video.uuid ])
         },
 
         err => {
           this.isUpdatingVideo = false
-          this.notificationsService.error('Error', err.message)
+          this.notificationsService.error(this.i18n('Error'), err.message)
           console.error(err)
         }
       )
diff --git a/client/src/app/videos/+video-edit/video-update.component.html b/client/src/app/videos/+video-edit/video-update.component.html
index a1b4707be..73b2bc08f 100644
--- a/client/src/app/videos/+video-edit/video-update.component.html
+++ b/client/src/app/videos/+video-edit/video-update.component.html
@@ -1,5 +1,5 @@
 <div class="margin-content">
-  <div class="title-page title-page-single">
+  <div i18n class="title-page title-page-single">
     Update {{ video?.name }}
   </div>
 
@@ -13,7 +13,7 @@
     <div class="submit-container">
       <div class="submit-button" (click)="update()" [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }">
         <span class="icon icon-validate"></span>
-        <input type="button" value="Update" />
+        <input type="button" i18n-value value="Update" />
       </div>
     </div>
   </form>
diff --git a/client/src/app/videos/+video-edit/video-update.component.ts b/client/src/app/videos/+video-edit/video-update.component.ts
index 310285f92..e37dd526f 100644
--- a/client/src/app/videos/+video-edit/video-update.component.ts
+++ b/client/src/app/videos/+video-edit/video-update.component.ts
@@ -12,6 +12,7 @@ import { ValidatorMessage } from '../../shared/forms/form-validators/validator-m
 import { VideoEdit } from '../../shared/video/video-edit.model'
 import { VideoService } from '../../shared/video/video.service'
 import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
   selector: 'my-videos-update',
@@ -37,7 +38,8 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     private videoService: VideoService,
     private authService: AuthService,
     private loadingBar: LoadingBarService,
-    private videoChannelService: VideoChannelService
+    private videoChannelService: VideoChannelService,
+    private i18n: I18n
   ) {
     super()
   }
@@ -91,7 +93,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
 
           err => {
             console.error(err)
-            this.notificationsService.error('Error', err.message)
+            this.notificationsService.error(this.i18n('Error'), err.message)
           }
         )
   }
@@ -116,13 +118,13 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
                        () => {
                          this.isUpdatingVideo = false
                          this.loadingBar.complete()
-                         this.notificationsService.success('Success', 'Video updated.')
+                         this.notificationsService.success(this.i18n('Success'), this.i18n('Video updated.'))
                          this.router.navigate([ '/videos/watch', this.video.uuid ])
                        },
 
                        err => {
                          this.isUpdatingVideo = false
-                         this.notificationsService.error('Error', err.message)
+                         this.notificationsService.error(this.i18n('Error'), err.message)
                          console.error(err)
                        }
                       )
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>
diff --git a/client/src/app/videos/video-list/video-local.component.ts b/client/src/app/videos/video-list/video-local.component.ts
index 03568b618..2fd82a940 100644
--- a/client/src/app/videos/video-list/video-local.component.ts
+++ b/client/src/app/videos/video-list/video-local.component.ts
@@ -27,8 +27,8 @@ export class VideoLocalComponent extends AbstractVideoList implements OnInit, On
     protected notificationsService: NotificationsService,
     protected authService: AuthService,
     protected location: Location,
-    private videoService: VideoService,
-    private i18n: I18n
+    protected i18n: I18n,
+    private videoService: VideoService
   ) {
     super()
 
diff --git a/client/src/app/videos/video-list/video-recently-added.component.ts b/client/src/app/videos/video-list/video-recently-added.component.ts
index 5768d9fe0..8183357f8 100644
--- a/client/src/app/videos/video-list/video-recently-added.component.ts
+++ b/client/src/app/videos/video-list/video-recently-added.component.ts
@@ -25,8 +25,8 @@ export class VideoRecentlyAddedComponent extends AbstractVideoList implements On
     protected location: Location,
     protected notificationsService: NotificationsService,
     protected authService: AuthService,
-    private videoService: VideoService,
-    private i18n: I18n
+    protected i18n: I18n,
+    private videoService: VideoService
   ) {
     super()
 
diff --git a/client/src/app/videos/video-list/video-search.component.ts b/client/src/app/videos/video-list/video-search.component.ts
index 35566a7bd..b6434f347 100644
--- a/client/src/app/videos/video-list/video-search.component.ts
+++ b/client/src/app/videos/video-list/video-search.component.ts
@@ -31,9 +31,9 @@ export class VideoSearchComponent extends AbstractVideoList implements OnInit, O
     protected notificationsService: NotificationsService,
     protected authService: AuthService,
     protected location: Location,
+    protected i18n: I18n,
     private videoService: VideoService,
-    private redirectService: RedirectService,
-    private i18n: I18n
+    private redirectService: RedirectService
   ) {
     super()
 
diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts
index 760470e8c..e56b749d1 100644
--- a/client/src/app/videos/video-list/video-trending.component.ts
+++ b/client/src/app/videos/video-list/video-trending.component.ts
@@ -25,8 +25,8 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit,
     protected notificationsService: NotificationsService,
     protected authService: AuthService,
     protected location: Location,
-    private videoService: VideoService,
-    private i18n: I18n
+    protected i18n: I18n,
+    private videoService: VideoService
   ) {
     super()