Merge branch 'release/v1.2.0'

[github/Chocobozzz/PeerTube.git] / client / src / app / videos / +video-edit / shared / video-edit.component.html

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 69f306519b407e1f048ac842de4c6fe5878f540c..092c0e86224b038ca033c93aa0f6482c2262c887 100644 (file)
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html
@@ -18,6 +18,7 @@
               <my-help i18n-preHtml preHtml="Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag."></my-help>
               <tag-input
                 [validators]="tagValidators" [errorMessages]="tagValidatorsMessages"
+                i18n-placeholder placeholder="+ Tag" i18n-secondaryPlaceholder secondaryPlaceholder="Enter a new tag"
                 formControlName="tags" maxItems="5" modelAsStrings="true"
               ></tag-input>
             </div>
@@ -125,6 +126,7 @@
             ></my-peertube-checkbox>
 
             <my-peertube-checkbox
+              *ngIf="waitTranscodingEnabled"
               inputName="waitTranscoding" formControlName="waitTranscoding"
               i18n-labelText labelText="Wait transcoding before publishing the video"
               i18n-helpHtml helpHtml="If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends."
@@ -141,7 +143,7 @@
 
           <div class="captions-header">
             <a (click)="openAddCaptionModal()" class="create-caption">
-              <span class="icon icon-add"></span>
+              <my-global-icon iconName="add"></my-global-icon>
               <ng-container i18n>Add another caption</ng-container>
             </a>
           </div>
@@ -155,7 +157,7 @@
                   [href]="videoCaption.captionPath"
                 >{{ videoCaption.language.label }}</a>
 
-                <div class="caption-entry-state">Already uploaded      &#10004;</div>
+                <div i18n class="caption-entry-state">Already uploaded &#10004;</div>
 
                 <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Delete</span>
               </ng-container>
@@ -163,7 +165,7 @@
               <ng-container *ngIf="videoCaption.action === 'CREATE'">
                 <span class="caption-entry-label">{{ videoCaption.language.label }}</span>
 
-                <div class="caption-entry-state caption-entry-state-create">Will be created on update</div>
+                <div i18n class="caption-entry-state caption-entry-state-create">Will be created on update</div>
 
                 <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel create</span>
               </ng-container>
@@ -171,14 +173,14 @@
               <ng-container *ngIf="videoCaption.action === 'REMOVE'">
                 <span class="caption-entry-label">{{ videoCaption.language.label }}</span>
 
-                <div class="caption-entry-state caption-entry-state-delete">Will be deleted on update</div>
+                <div i18n class="caption-entry-state caption-entry-state-delete">Will be deleted on update</div>
 
                 <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel deletion</span>
               </ng-container>
             </div>
           </div>
 
-          <div class="no-caption" *ngIf="videoCaptions?.length === 0">
+          <div i18n class="no-caption" *ngIf="videoCaptions?.length === 0">
             No captions for now.
           </div>