Merge branch 'master' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / instance / instance-features-table.component.ts

diff --git a/client/src/app/shared/instance/instance-features-table.component.ts b/client/src/app/shared/instance/instance-features-table.component.ts
index da8da07023f391663fa44d60cddcdd32bfee9021..72e7c2730f3c93cd469c4a018e9d8cd263954696 100644 (file)
--- a/client/src/app/shared/instance/instance-features-table.component.ts
+++ b/client/src/app/shared/instance/instance-features-table.component.ts
@@ -33,10 +33,26 @@ export class InstanceFeaturesTableComponent implements OnInit {
         })
   }
 
+  buildNSFWLabel () {
+    const policy = this.serverService.getConfig().instance.defaultNSFWPolicy
+
+    if (policy === 'do_not_list') return this.i18n('Hidden')
+    if (policy === 'blur') return this.i18n('Blurred with confirmation request')
+    if (policy === 'display') return this.i18n('Displayed')
+  }
+
   private buildFeatures () {
     const config = this.serverService.getConfig()
 
     this.features = [
+      {
+        label: this.i18n('User registration allowed'),
+        value: config.signup.allowed
+      },
+      {
+        label: this.i18n('Video uploads require manual validation by moderators'),
+        value: config.autoBlacklist.videos.ofUsers.enabled
+      },
       {
         label: this.i18n('Transcode your videos in multiple resolutions'),
         value: config.transcoding.enabledResolutions.length !== 0
@@ -48,9 +64,12 @@ export class InstanceFeaturesTableComponent implements OnInit {
       {
         label: this.i18n('Torrent import'),
         value: config.import.videos.torrent.enabled
+      },
+      {
+        label: this.i18n('P2P enabled'),
+        value: config.tracker.enabled
       }
     ]
-
   }
 
   private getApproximateTime (seconds: number) {
@@ -84,5 +103,4 @@ export class InstanceFeaturesTableComponent implements OnInit {
 
     this.quotaHelpIndication = lines.join('<br />')
   }
-
 }