X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fshared-video-miniature%2Fvideo-download.component.ts;h=99838f712b22f4501598d54a97e2c522c90406c7;hb=66357162f8e1227495f09bd4f68446aad7071c6d;hp=21df8b674bd94b89092bc352c0b85c199ffc9ecc;hpb=67ed6552b831df66713bac9e672738796128d33f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/shared/shared-video-miniature/video-download.component.ts b/client/src/app/shared/shared-video-miniature/video-download.component.ts index 21df8b674..99838f712 100644 --- a/client/src/app/shared/shared-video-miniature/video-download.component.ts +++ b/client/src/app/shared/shared-video-miniature/video-download.component.ts @@ -1,12 +1,9 @@ -import { FfprobeFormat, FfprobeStream } from 'fluent-ffmpeg' import { mapValues, pick } from 'lodash-es' -import { BytesPipe } from 'ngx-pipes' import { Component, ElementRef, ViewChild } from '@angular/core' import { AuthService, Notifier } from '@app/core' import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { I18n } from '@ngx-translate/i18n-polyfill' import { VideoCaption, VideoFile, VideoPrivacy } from '@shared/models' -import { NumberFormatterPipe, VideoDetails, VideoService } from '../shared-main' +import { BytesPipe, NumberFormatterPipe, VideoDetails, VideoService } from '../shared-main' type DownloadType = 'video' | 'subtitles' type FileMetadata = { [key: string]: { label: string, value: string }} @@ -40,8 +37,7 @@ export class VideoDownloadComponent { private notifier: Notifier, private modalService: NgbModal, private videoService: VideoService, - private auth: AuthService, - private i18n: I18n + private auth: AuthService ) { this.bytesPipe = new BytesPipe() this.numbersPipe = new NumberFormatterPipe() @@ -49,8 +45,8 @@ export class VideoDownloadComponent { get typeText () { return this.type === 'video' - ? this.i18n('video') - : this.i18n('subtitles') + ? $localize`video` + : $localize`subtitles` } getVideoFiles () { @@ -137,20 +133,20 @@ export class VideoDownloadComponent { } activateCopiedMessage () { - this.notifier.success(this.i18n('Copied')) + this.notifier.success($localize`Copied`) } switchToType (type: DownloadType) { this.type = type } - getMetadataFormat (format: FfprobeFormat) { + getMetadataFormat (format: any) { const keyToTranslateFunction = { - 'encoder': (value: string) => ({ label: this.i18n('Encoder'), value }), - 'format_long_name': (value: string) => ({ label: this.i18n('Format name'), value }), - 'size': (value: number) => ({ label: this.i18n('Size'), value: this.bytesPipe.transform(value, 2) }), + 'encoder': (value: string) => ({ label: $localize`Encoder`, value }), + 'format_long_name': (value: string) => ({ label: $localize`Format name`, value }), + 'size': (value: number) => ({ label: $localize`Size`, value: this.bytesPipe.transform(value, 2) }), 'bit_rate': (value: number) => ({ - label: this.i18n('Bitrate'), + label: $localize`Bitrate`, value: `${this.numbersPipe.transform(value)}bps` }) } @@ -165,30 +161,30 @@ export class VideoDownloadComponent { ) } - getMetadataStream (streams: FfprobeStream[], type: 'video' | 'audio') { + getMetadataStream (streams: any[], type: 'video' | 'audio') { const stream = streams.find(s => s.codec_type === type) if (!stream) return undefined let keyToTranslateFunction = { - 'codec_long_name': (value: string) => ({ label: this.i18n('Codec'), value }), - 'profile': (value: string) => ({ label: this.i18n('Profile'), value }), + 'codec_long_name': (value: string) => ({ label: $localize`Codec`, value }), + 'profile': (value: string) => ({ label: $localize`Profile`, value }), 'bit_rate': (value: number) => ({ - label: this.i18n('Bitrate'), + label: $localize`Bitrate`, value: `${this.numbersPipe.transform(value)}bps` }) } if (type === 'video') { keyToTranslateFunction = Object.assign(keyToTranslateFunction, { - 'width': (value: number) => ({ label: this.i18n('Resolution'), value: `${value}x${stream.height}` }), - 'display_aspect_ratio': (value: string) => ({ label: this.i18n('Aspect ratio'), value }), - 'avg_frame_rate': (value: string) => ({ label: this.i18n('Average frame rate'), value }), - 'pix_fmt': (value: string) => ({ label: this.i18n('Pixel format'), value }) + 'width': (value: number) => ({ label: $localize`Resolution`, value: `${value}x${stream.height}` }), + 'display_aspect_ratio': (value: string) => ({ label: $localize`Aspect ratio`, value }), + 'avg_frame_rate': (value: string) => ({ label: $localize`Average frame rate`, value }), + 'pix_fmt': (value: string) => ({ label: $localize`Pixel format`, value }) }) } else { keyToTranslateFunction = Object.assign(keyToTranslateFunction, { - 'sample_rate': (value: number) => ({ label: this.i18n('Sample rate'), value }), - 'channel_layout': (value: number) => ({ label: this.i18n('Channel Layout'), value }) + 'sample_rate': (value: number) => ({ label: $localize`Sample rate`, value }), + 'channel_layout': (value: number) => ({ label: $localize`Channel Layout`, value }) }) } @@ -201,6 +197,7 @@ export class VideoDownloadComponent { private hydrateMetadataFromMetadataUrl (file: VideoFile) { const observable = this.videoService.getVideoFileMetadata(file.metadataUrl) observable.subscribe(res => file.metadata = res) + return observable.toPromise() } }