aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+admin
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+admin')
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html6
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts5
2 files changed, 8 insertions, 3 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 82f467e16..8d6c9ab5b 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
@@ -549,7 +549,11 @@
549 <my-peertube-checkbox 549 <my-peertube-checkbox
550 [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id" 550 [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
551 i18n-labelText labelText="Resolution {{resolution.label}} enabled" 551 i18n-labelText labelText="Resolution {{resolution.label}} enabled"
552 ></my-peertube-checkbox> 552 >
553 <ng-template *ngIf="resolution.description" ptTemplate="help">
554 <div i18n [innerHTML]="resolution.description"></div>
555 </ng-template>
556 </my-peertube-checkbox>
553 </div> 557 </div>
554 </ng-container> 558 </ng-container>
555 559
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 25e06d8a1..ed9c3247c 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
@@ -18,7 +18,7 @@ import { ServerConfig } from '@shared/models'
18export class EditCustomConfigComponent extends FormReactive implements OnInit { 18export class EditCustomConfigComponent extends FormReactive implements OnInit {
19 customConfig: CustomConfig 19 customConfig: CustomConfig
20 20
21 resolutions: { id: string, label: string }[] = [] 21 resolutions: { id: string, label: string, description?: string }[] = []
22 transcodingThreadOptions: { label: string, value: number }[] = [] 22 transcodingThreadOptions: { label: string, value: number }[] = []
23 23
24 languageItems: SelectItem[] = [] 24 languageItems: SelectItem[] = []
@@ -40,7 +40,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
40 this.resolutions = [ 40 this.resolutions = [
41 { 41 {
42 id: '0p', 42 id: '0p',
43 label: this.i18n('Audio-only') 43 label: this.i18n('Audio-only'),
44 description: `A <code>.mp4</code> that keeps the original audio track, with no video`
44 }, 45 },
45 { 46 {
46 id: '240p', 47 id: '240p',