From 3827c3b3488845f4235714e92eea439423df2909 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 26 Sep 2018 14:46:54 +0200 Subject: Fix quota translations --- .../edit-custom-config.component.ts | 51 +++++++++------------- .../src/app/+admin/config/shared/config.service.ts | 31 ++++++++++++- 2 files changed, 49 insertions(+), 33 deletions(-) (limited to 'client/src/app/+admin/config') 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 9b3bd86f1..4983b0425 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 @@ -14,37 +14,10 @@ import { BuildFormDefaultValues, FormValidatorService } from '@app/shared/forms/ styleUrls: [ './edit-custom-config.component.scss' ] }) export class EditCustomConfigComponent extends FormReactive implements OnInit { - static videoQuotaOptions = [ - { value: -1, label: 'Unlimited' }, - { value: 0, label: '0' }, - { value: 100 * 1024 * 1024, label: '100MB' }, - { value: 500 * 1024 * 1024, label: '500MB' }, - { value: 1024 * 1024 * 1024, label: '1GB' }, - { value: 5 * 1024 * 1024 * 1024, label: '5GB' }, - { value: 20 * 1024 * 1024 * 1024, label: '20GB' }, - { value: 50 * 1024 * 1024 * 1024, label: '50GB' } - ] - static videoQuotaDailyOptions = [ - { value: -1, label: 'Unlimited' }, - { value: 0, label: '0' }, - { value: 10 * 1024 * 1024, label: '10MB' }, - { value: 50 * 1024 * 1024, label: '50MB' }, - { value: 100 * 1024 * 1024, label: '100MB' }, - { value: 500 * 1024 * 1024, label: '500MB' }, - { value: 2 * 1024 * 1024 * 1024, label: '2GB' }, - { value: 5 * 1024 * 1024 * 1024, label: '5GB' } - ] - customConfig: CustomConfig - resolutions = [ '240p', '360p', '480p', '720p', '1080p' ] - transcodingThreadOptions = [ - { value: 0, label: 'Auto (via ffmpeg)' }, - { value: 1, label: '1' }, - { value: 2, label: '2' }, - { value: 4, label: '4' }, - { value: 8, label: '8' } - ] + resolutions: string[] = [] + transcodingThreadOptions: { label: string, value: number }[] = [] private oldCustomJavascript: string private oldCustomCSS: string @@ -60,14 +33,30 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { private i18n: I18n ) { super() + + this.resolutions = [ + this.i18n('240p'), + this.i18n('360p'), + this.i18n('480p'), + this.i18n('720p'), + this.i18n('1080p') + ] + + this.transcodingThreadOptions = [ + { value: 0, label: this.i18n('Auto (via ffmpeg)') }, + { value: 1, label: '1' }, + { value: 2, label: '2' }, + { value: 4, label: '4' }, + { value: 8, label: '8' } + ] } get videoQuotaOptions () { - return EditCustomConfigComponent.videoQuotaOptions + return this.configService.videoQuotaOptions } get videoQuotaDailyOptions () { - return EditCustomConfigComponent.videoQuotaDailyOptions + return this.configService.videoQuotaDailyOptions } getResolutionKey (resolution: string) { diff --git a/client/src/app/+admin/config/shared/config.service.ts b/client/src/app/+admin/config/shared/config.service.ts index 7c61fe9e7..28a3d67d6 100644 --- a/client/src/app/+admin/config/shared/config.service.ts +++ b/client/src/app/+admin/config/shared/config.service.ts @@ -4,15 +4,42 @@ import { Injectable } from '@angular/core' import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model' import { environment } from '../../../../environments/environment' import { RestExtractor } from '../../../shared' +import { I18n } from '@ngx-translate/i18n-polyfill' @Injectable() export class ConfigService { private static BASE_APPLICATION_URL = environment.apiUrl + '/api/v1/config' + videoQuotaOptions: { value: number, label: string }[] = [] + videoQuotaDailyOptions: { value: number, label: string }[] = [] + constructor ( private authHttp: HttpClient, - private restExtractor: RestExtractor - ) {} + private restExtractor: RestExtractor, + private i18n: I18n + ) { + this.videoQuotaOptions = [ + { value: -1, label: this.i18n('Unlimited') }, + { value: 0, label: '0' }, + { value: 100 * 1024 * 1024, label: this.i18n('100MB') }, + { value: 500 * 1024 * 1024, label: this.i18n('500MB') }, + { value: 1024 * 1024 * 1024, label: this.i18n('1GB') }, + { value: 5 * 1024 * 1024 * 1024, label: this.i18n('5GB') }, + { value: 20 * 1024 * 1024 * 1024, label: this.i18n('20GB') }, + { value: 50 * 1024 * 1024 * 1024, label: this.i18n('50GB') } + ] + + this.videoQuotaDailyOptions = [ + { value: -1, label: this.i18n('Unlimited') }, + { value: 0, label: '0' }, + { value: 10 * 1024 * 1024, label: this.i18n('10MB') }, + { value: 50 * 1024 * 1024, label: this.i18n('50MB') }, + { value: 100 * 1024 * 1024, label: this.i18n('100MB') }, + { value: 500 * 1024 * 1024, label: this.i18n('500MB') }, + { value: 2 * 1024 * 1024 * 1024, label: this.i18n('2GB') }, + { value: 5 * 1024 * 1024 * 1024, label: this.i18n('5GB') } + ] + } getCustomConfig () { return this.authHttp.get(ConfigService.BASE_APPLICATION_URL + '/custom') -- cgit v1.2.3