aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html2
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts4
2 files changed, 5 insertions, 1 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
index 1c5d6a9b4..048f7908d 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
@@ -51,7 +51,7 @@
51 i18n-labelText labelText="Allow additional extensions" 51 i18n-labelText labelText="Allow additional extensions"
52 > 52 >
53 <ng-container ngProjectAs="description"> 53 <ng-container ngProjectAs="description">
54 <span i18n>Allows users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, .m2ts, .mxf, or .nut videos.</span> 54 <span i18n>Allows users to upload {{ additionalVideoExtensions }} videos.</span>
55 </ng-container> 55 </ng-container>
56 </my-peertube-checkbox> 56 </my-peertube-checkbox>
57 </div> 57 </div>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
index a2dc3e52a..b017dd08c 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
@@ -20,6 +20,8 @@ export class EditVODTranscodingComponent implements OnInit, OnChanges {
20 transcodingProfiles: SelectOptionsItem[] = [] 20 transcodingProfiles: SelectOptionsItem[] = []
21 resolutions: ResolutionOption[] = [] 21 resolutions: ResolutionOption[] = []
22 22
23 additionalVideoExtensions = ''
24
23 constructor ( 25 constructor (
24 private configService: ConfigService, 26 private configService: ConfigService,
25 private editConfigurationService: EditConfigurationService 27 private editConfigurationService: EditConfigurationService
@@ -35,6 +37,8 @@ export class EditVODTranscodingComponent implements OnInit, OnChanges {
35 ngOnChanges (changes: SimpleChanges) { 37 ngOnChanges (changes: SimpleChanges) {
36 if (changes['serverConfig']) { 38 if (changes['serverConfig']) {
37 this.transcodingProfiles = this.buildAvailableTranscodingProfile() 39 this.transcodingProfiles = this.buildAvailableTranscodingProfile()
40
41 this.additionalVideoExtensions = this.serverConfig.video.file.extensions.join(' ')
38 } 42 }
39 } 43 }
40 44