Add i18n attributes

2 files changed, 96 insertions, 72 deletions

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index 8a1e33c56..4263b7b5f 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -4,13 +4,13 @@
 
     <tab heading="Basic configuration">
 
-      <div class="inner-form-title">Instance</div>
+      <div i18n class="inner-form-title">Instance</div>
 
       <div class="form-group">
-        <label for="instanceName">Name</label>
+        <label i18n for="instanceName">Name</label>
         <input
-            type="text" id="instanceName"
-            formControlName="instanceName" [ngClass]="{ 'input-error': formErrors['instanceName'] }"
+          type="text" id="instanceName"
+          formControlName="instanceName" [ngClass]="{ 'input-error': formErrors['instanceName'] }"
         >
         <div *ngIf="formErrors.instanceName" class="form-error">
           {{ formErrors.instanceName }}
@@ -18,10 +18,10 @@
       </div>
 
       <div class="form-group">
-        <label for="instanceShortDescription">Short description</label>
+        <label i18n for="instanceShortDescription">Short description</label>
         <textarea
-            id="instanceShortDescription" formControlName="instanceShortDescription"
-            [ngClass]="{ 'input-error': formErrors['instanceShortDescription'] }"
+          id="instanceShortDescription" formControlName="instanceShortDescription"
+          [ngClass]="{ 'input-error': formErrors['instanceShortDescription'] }"
         ></textarea>
         <div *ngIf="formErrors.instanceShortDescription" class="form-error">
           {{ formErrors.instanceShortDescription }}
@@ -29,10 +29,10 @@
       </div>
 
       <div class="form-group">
-        <label for="instanceDescription">Description</label><my-help helpType="markdownText"></my-help>
+        <label i18n for="instanceDescription">Description</label><my-help helpType="markdownText"></my-help>
         <my-markdown-textarea
-            id="instanceDescription" formControlName="instanceDescription" textareaWidth="500px" [previewColumn]="true"
-            [classes]="{ 'input-error': formErrors['instanceDescription'] }"
+          id="instanceDescription" formControlName="instanceDescription" textareaWidth="500px" [previewColumn]="true"
+          [classes]="{ 'input-error': formErrors['instanceDescription'] }"
         ></my-markdown-textarea>
         <div *ngIf="formErrors.instanceDescription" class="form-error">
           {{ formErrors.instanceDescription }}
@@ -40,10 +40,10 @@
       </div>
 
       <div class="form-group">
-        <label for="instanceTerms">Terms</label><my-help helpType="markdownText"></my-help>
+        <label i18n for="instanceTerms">Terms</label><my-help helpType="markdownText"></my-help>
         <my-markdown-textarea
-            id="instanceTerms" formControlName="instanceTerms" textareaWidth="500px" [previewColumn]="true"
-            [ngClass]="{ 'input-error': formErrors['instanceTerms'] }"
+          id="instanceTerms" formControlName="instanceTerms" textareaWidth="500px" [previewColumn]="true"
+          [ngClass]="{ 'input-error': formErrors['instanceTerms'] }"
         ></my-markdown-textarea>
         <div *ngIf="formErrors.instanceTerms" class="form-error">
           {{ formErrors.instanceTerms }}
@@ -51,12 +51,12 @@
       </div>
 
       <div class="form-group">
-        <label for="instanceDefaultClientRoute">Default client route</label>
+        <label i18n for="instanceDefaultClientRoute">Default client route</label>
         <div class="peertube-select-container">
           <select id="instanceDefaultClientRoute" formControlName="instanceDefaultClientRoute">
-            <option value="/videos/trending">Videos Trending</option>
-            <option value="/videos/recently-added">Videos Recently Added</option>
-            <option value="/videos/local">Local videos</option>
+            <option i18n value="/videos/trending">Videos Trending</option>
+            <option i18n value="/videos/recently-added">Videos Recently Added</option>
+            <option i18n value="/videos/local">Local videos</option>
           </select>
         </div>
         <div *ngIf="formErrors.instanceDefaultClientRoute" class="form-error">
@@ -65,14 +65,17 @@
       </div>
 
       <div class="form-group">
-        <label for="instanceDefaultNSFWPolicy">Policy on videos containing sensitive content</label>
-        <my-help helpType="custom" customHtml="With <strong>Do not list</strong> or <strong>Blur thumbnails</strong>, a confirmation will be requested to watch the video."></my-help>
+        <label i18n for="instanceDefaultNSFWPolicy">Policy on videos containing sensitive content</label>
+        <my-help
+          helpType="custom" i18n-customHtml
+          customHtml="With <strong>Do not list</strong> or <strong>Blur thumbnails</strong>, a confirmation will be requested to watch the video."
+        ></my-help>
 
         <div class="peertube-select-container">
           <select id="instanceDefaultNSFWPolicy" formControlName="instanceDefaultNSFWPolicy">
-            <option value="do_not_list">Do not list</option>
-            <option value="blur">Blur thumbnails</option>
-            <option value="display">Display</option>
+            <option i18n value="do_not_list">Do not list</option>
+            <option i18n value="blur">Blur thumbnails</option>
+            <option i18n value="display">Display</option>
           </select>
         </div>
         <div *ngIf="formErrors.instanceDefaultNSFWPolicy" class="form-error">
@@ -80,43 +83,43 @@
         </div>
       </div>
 
-      <div class="inner-form-title">Signup</div>
+      <div i18n class="inner-form-title">Signup</div>
 
       <div class="form-group">
         <input type="checkbox" id="signupEnabled" formControlName="signupEnabled">
 
         <label for="signupEnabled"></label>
-        <label for="signupEnabled">Signup enabled</label>
+        <label i18n for="signupEnabled">Signup enabled</label>
       </div>
 
       <div *ngIf="isSignupEnabled()" class="form-group">
-        <label for="signupLimit">Signup limit</label>
+        <label i18n for="signupLimit">Signup limit</label>
         <input
-            type="text" id="signupLimit"
-            formControlName="signupLimit" [ngClass]="{ 'input-error': formErrors['signupLimit'] }"
+          type="text" id="signupLimit"
+          formControlName="signupLimit" [ngClass]="{ 'input-error': formErrors['signupLimit'] }"
         >
         <div *ngIf="formErrors.signupLimit" class="form-error">
           {{ formErrors.signupLimit }}
         </div>
       </div>
 
-      <div class="inner-form-title">Administrator</div>
+      <div i18n class="inner-form-title">Administrator</div>
 
       <div class="form-group">
-        <label for="adminEmail">Admin email</label>
+        <label i18n for="adminEmail">Admin email</label>
         <input
-            type="text" id="adminEmail"
-            formControlName="adminEmail" [ngClass]="{ 'input-error': formErrors['adminEmail'] }"
+          type="text" id="adminEmail"
+          formControlName="adminEmail" [ngClass]="{ 'input-error': formErrors['adminEmail'] }"
         >
         <div *ngIf="formErrors.adminEmail" class="form-error">
           {{ formErrors.adminEmail }}
         </div>
       </div>
 
-      <div class="inner-form-title">Users</div>
+      <div i18n class="inner-form-title">Users</div>
 
       <div class="form-group">
-        <label for="userVideoQuota">User default video quota</label>
+        <label i18n for="userVideoQuota">User default video quota</label>
         <div class="peertube-select-container">
           <select id="userVideoQuota" formControlName="userVideoQuota">
             <option *ngFor="let videoQuotaOption of videoQuotaOptions" [value]="videoQuotaOption.value">
@@ -132,14 +135,17 @@
 
     <tab heading="Services">
 
-      <div class="inner-form-title">Twitter</div>
+      <div i18n class="inner-form-title">Twitter</div>
 
       <div class="form-group">
-        <label for="signupLimit">Your Twitter username</label>
-        <my-help helpType="custom" customHtml="Indicates the Twitter account for the website or platform on which the content was published."></my-help>
+        <label i18n for="signupLimit">Your Twitter username</label>
+        <my-help
+          helpType="custom" i18n-customHtml
+          customHtml="Indicates the Twitter account for the website or platform on which the content was published."
+        ></my-help>
         <input
-            type="text" id="servicesTwitterUsername"
-            formControlName="servicesTwitterUsername" [ngClass]="{ 'input-error': formErrors['servicesTwitterUsername'] }"
+          type="text" id="servicesTwitterUsername"
+          formControlName="servicesTwitterUsername" [ngClass]="{ 'input-error': formErrors['servicesTwitterUsername'] }"
         >
         <div *ngIf="formErrors.servicesTwitterUsername" class="form-error">
           {{ formErrors.servicesTwitterUsername }}
@@ -150,29 +156,32 @@
         <input type="checkbox" id="servicesTwitterWhitelisted" formControlName="servicesTwitterWhitelisted">
 
         <label for="servicesTwitterWhitelisted"></label>
-        <label for="servicesTwitterWhitelisted">Instance whitelisted by Twitter</label>
-        <my-help helpType="custom" customHtml="If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
+        <label i18n for="servicesTwitterWhitelisted">Instance whitelisted by Twitter</label>
+        <my-help
+          helpType="custom" i18n-customHtml
+          customHtml="If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
 If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br />
-Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted."></my-help>
+Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted."
+        ></my-help>
 
       </div>
     </tab>
 
     <tab heading="Advanced configuration">
 
-      <div class="inner-form-title">Transcoding</div>
+      <div i18n class="inner-form-title">Transcoding</div>
 
       <div class="form-group">
         <input type="checkbox" id="transcodingEnabled" formControlName="transcodingEnabled">
 
         <label for="transcodingEnabled"></label>
-        <label for="transcodingEnabled">Transcoding enabled</label>
+        <label i18n for="transcodingEnabled">Transcoding enabled</label>
       </div>
 
       <ng-template [ngIf]="isTranscodingEnabled()">
 
         <div class="form-group">
-          <label for="transcodingThreads">Transcoding threads</label>
+          <label i18n for="transcodingThreads">Transcoding threads</label>
           <div class="peertube-select-container">
             <select id="transcodingThreads" formControlName="transcodingThreads">
               <option *ngFor="let transcodingThreadOption of transcodingThreadOptions" [value]="transcodingThreadOption.value">
@@ -191,33 +200,39 @@ Check this checkbox, save the configuration and test with a video URL of your in
               [formControlName]="getResolutionKey(resolution)"
           >
           <label [for]="getResolutionKey(resolution)"></label>
-          <label [for]="getResolutionKey(resolution)">Resolution {{ resolution }} enabled</label>
+          <label i18n [for]="getResolutionKey(resolution)">Resolution {{ resolution }} enabled</label>
         </div>
       </ng-template>
 
-      <div class="inner-form-title">Cache</div>
+      <div i18n class="inner-form-title">Cache</div>
 
       <div class="form-group">
-        <label for="cachePreviewsSize">Preview cache size</label>
-        <my-help helpType="custom" customHtml="Previews are not federated. We fetch them directly from the origin instance and cache them."></my-help>
+        <label i18n for="cachePreviewsSize">Preview cache size</label>
+        <my-help
+          helpType="custom" i18n-customHtml
+          customHtml="Previews are not federated. We fetch them directly from the origin instance and cache them."
+        ></my-help>
 
         <input
-            type="text" id="cachePreviewsSize"
-            formControlName="cachePreviewsSize" [ngClass]="{ 'input-error': formErrors['cachePreviewsSize'] }"
+          type="text" id="cachePreviewsSize"
+          formControlName="cachePreviewsSize" [ngClass]="{ 'input-error': formErrors['cachePreviewsSize'] }"
         >
         <div *ngIf="formErrors.cachePreviewsSize" class="form-error">
           {{ formErrors.cachePreviewsSize }}
         </div>
       </div>
 
-      <div class="inner-form-title">Customizations</div>
+      <div i18n class="inner-form-title">Customizations</div>
 
       <div class="form-group">
-        <label for="customizationJavascript">JavaScript</label>
-        <my-help helpType="custom" customHtml="Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre>"></my-help>
+        <label i18n for="customizationJavascript">JavaScript</label>
+        <my-help
+          helpType="custom" i18n-customHtml
+          customHtml="Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre>"
+        ></my-help>
         <textarea
-            id="customizationJavascript" formControlName="customizationJavascript"
-            [ngClass]="{ 'input-error': formErrors['customizationJavascript'] }"
+          id="customizationJavascript" formControlName="customizationJavascript"
+          [ngClass]="{ 'input-error': formErrors['customizationJavascript'] }"
         ></textarea>
         <div *ngIf="formErrors.customizationJavascript" class="form-error">
           {{ formErrors.customizationJavascript }}
@@ -228,25 +243,26 @@ Check this checkbox, save the configuration and test with a video URL of your in
         <label for="customizationCSS">CSS</label>
         <my-help
             helpType="custom"
+            i18n-customHtml
             customHtml="
               Write directly CSS code. Example:<br />
               <pre>
-    body {
+    body {{ '{' }}
       background-color: red;
-    }
+    {{ '}' }}
               </pre>
 
               Prepend with <em>#custom-css</em> to override styles. Example:
               <pre>
-    #custom-css .logged-in-email {
+    #custom-css .logged-in-email {{ '{' }}
       color: red;
-    }
+    {{ '}' }}
               </pre>
             "
         ></my-help>
         <textarea
-            id="customizationCSS" formControlName="customizationCSS"
-            [ngClass]="{ 'input-error': formErrors['customizationCSS'] }"
+          id="customizationCSS" formControlName="customizationCSS"
+          [ngClass]="{ 'input-error': formErrors['customizationCSS'] }"
         ></textarea>
         <div *ngIf="formErrors.customizationCSS" class="form-error">
           {{ formErrors.customizationCSS }}
@@ -255,5 +271,5 @@ Check this checkbox, save the configuration and test with a video URL of your in
     </tab>
   </tabset>
 
-  <input (click)="formValidated()" type="submit" value="Update configuration" [disabled]="!form.valid">
+  <input (click)="formValidated()" type="submit" i18n-value value="Update configuration" [disabled]="!form.valid">
 </form>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index a1e334a74..3f9205460 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -8,12 +8,15 @@ import { FormReactive, USER_VIDEO_QUOTA } from '@app/shared'
 import {
   ADMIN_EMAIL,
   CACHE_PREVIEWS_SIZE,
-  INSTANCE_NAME, INSTANCE_SHORT_DESCRIPTION, SERVICES_TWITTER_USERNAME,
+  INSTANCE_NAME,
+  INSTANCE_SHORT_DESCRIPTION,
+  SERVICES_TWITTER_USERNAME,
   SIGNUP_LIMIT,
   TRANSCODING_THREADS
 } from '@app/shared/forms/form-validators/custom-config'
 import { NotificationsService } from 'angular2-notifications'
 import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
   selector: 'my-edit-custom-config',
@@ -77,7 +80,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
     private notificationsService: NotificationsService,
     private configService: ConfigService,
     private serverService: ServerService,
-    private confirmService: ConfirmService
+    private confirmService: ConfirmService,
+    private i18n: I18n
   ) {
     super()
   }
@@ -133,7 +137,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
           this.forceCheck()
         },
 
-        err => this.notificationsService.error('Error', err.message)
+        err => this.notificationsService.error(this.i18n('Error'), err.message)
       )
   }
 
@@ -156,11 +160,15 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
     if (customizations.length !== 0) {
       const customizationsText = customizations.join('/')
 
-      const message = `You set custom ${customizationsText}. ` +
-        'This could lead to security issues or bugs if you do not understand it. ' +
-        'Are you sure you want to update the configuration?'
-      const label = `Please type "I understand the ${customizationsText} I set" to confirm.`
-      const expectedInputValue = `I understand the ${customizationsText} I set`
+      // FIXME: i18n service does not support string concatenation
+      const message = this.i18n('You set custom {{ customizationsText }}. ', { customizationsText }) +
+        this.i18n('This could lead to security issues or bugs if you do not understand it. ') +
+        this.i18n('Are you sure you want to update the configuration?')
+      const label = this.i18n(
+        'Please type "I understand the {{ customizationsText }} I set" to confirm.',
+        { customizationsText }
+      )
+      const expectedInputValue = this.i18n('I understand the {{ customizationsText }} I set', { customizationsText})
 
       const confirmRes = await this.confirmService.confirmWithInput(message, label, expectedInputValue)
       if (confirmRes === false) return
@@ -223,10 +231,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
 
           this.updateForm()
 
-          this.notificationsService.success('Success', 'Configuration updated.')
+          this.notificationsService.success(this.i18n('Success'), this.i18n('Configuration updated.'))
         },
 
-        err => this.notificationsService.error('Error', err.message)
+        err => this.notificationsService.error(this.i18n('Error'), err.message)
       )
   }