Merge branch 'release/2.1.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +about / about-instance / about-instance.component.html

diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html
index 9499bbe4e6703256dcccc018424965e2ff3ecb09..fc5736aba4a5556d31022877d6c8a13a0c8a1fcb 100644 (file)
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -2,9 +2,9 @@
   <div class="col-md-12 col-xl-6">
 
     <div class="about-instance-title">
-      <div i18n class="title">About {{ instanceName }} instance</div>
+      <div i18n class="title">About {{ instanceName }}</div>
 
-      <div *ngIf="isContactFormEnabled" (click)="openContactModal()" i18n role="button" class="contact-admin">Contact administrator</div>
+      <div i18n *ngIf="isContactFormEnabled" (click)="openContactModal()" role="button" class="contact-admin">Contact administrator</div>
     </div>
 
     <div class="block instance-badges">
@@ -16,10 +16,10 @@
     <div class="short-description">
       <div class="block short-description">{{ shortDescription }}</div>
 
-      <div *ngIf="isNSFW" class="block dedicated-to-nsfw">This instance is dedicated to sensitive/NSFW content.</div>
+      <div i18n *ngIf="isNSFW" class="block dedicated-to-nsfw">This instance is dedicated to sensitive/NSFW content.</div>
     </div>
 
-    <div class="middle-title" *ngIf="html.administrator || maintenanceLifetime || businessModel">
+    <div i18n class="middle-title" *ngIf="html.administrator || maintenanceLifetime || businessModel">
       Administrators & sustainability
     </div>
 
@@ -42,12 +42,12 @@
     </div>
 
     <div class="block business-model" *ngIf="businessModel">
-      <div i18n class="section-title">How we will pay this instance</div>
+      <div i18n class="section-title">How we will pay for this instance</div>
 
       <p>{{ businessModel }}</p>
     </div>
 
-    <div class="middle-title" *ngIf="html.description">
+    <div i18n class="middle-title" *ngIf="html.description">
       Information
     </div>
 
@@ -57,7 +57,7 @@
       <div [innerHTML]="html.description"></div>
     </div>
 
-    <div class="middle-title" *ngIf="html.moderationInformation || html.codeOfConduct || html.terms">
+    <div i18n class="middle-title" *ngIf="html.moderationInformation || html.codeOfConduct || html.terms">
       Moderation
     </div>
 
@@ -79,11 +79,11 @@
       <div [innerHTML]="html.terms"></div>
     </div>
 
-    <div class="middle-title" *ngIf="html.hardwareInformation">
+    <div i18n class="middle-title" *ngIf="html.hardwareInformation">
       Other information
     </div>
 
-    <div class="block hardware-information">
+    <div class="block hardware-information" *ngIf="html.hardwareInformation">
       <div i18n class="section-title">Hardware information</div>
 
       <div [innerHTML]="html.hardwareInformation"></div>
@@ -91,9 +91,16 @@
   </div>
 
   <div class="col-md-12 col-xl-6">
-    <label>Features found on this instance</label>
+    <label i18n>Features found on this instance</label>
     <my-instance-features-table></my-instance-features-table>
   </div>
+
+  <div class="col">
+    <div i18n class="middle-title">
+      Statistics
+    </div>
+    <my-instance-statistics></my-instance-statistics>
+  </div>
 </div>
 
 <my-contact-admin-modal #contactAdminModal></my-contact-admin-modal>