RED-3842: fix translations

This commit is contained in:
Dan Percic 2022-06-28 18:04:01 +03:00
parent b367a4b5ce
commit 97cd1b1764
3 changed files with 21 additions and 10 deletions

View File

@ -13,6 +13,7 @@ import { DossiersService } from '@services/dossiers/dossiers.service';
import { FilesService } from '@services/files/files.service';
import { DictionaryService } from '@services/entity-services/dictionary.service';
import { HttpEvent, HttpEventType, HttpProgressEvent, HttpResponse } from '@angular/common/http';
import { TranslateService } from '@ngx-translate/core';
const ONE_MEGABYTE = 1024 * 1024;
@ -23,14 +24,6 @@ function getRemainingTime(event: HttpProgressEvent, startTime: number) {
return Math.round(remaining / speed);
}
function getRemainingTimeVerbose(event: HttpProgressEvent, startTime: number) {
const remainingTime = getRemainingTime(event, startTime);
if (remainingTime > 60) {
return `${Math.round(remainingTime / 60)} minutes`;
}
return `${remainingTime} seconds`;
}
function isDownload(event: HttpEvent<Blob>): event is HttpProgressEvent {
return event.type === HttpEventType.DownloadProgress && event.total > ONE_MEGABYTE;
}
@ -62,6 +55,7 @@ export class FilePreviewStateService {
private readonly _dossiersService: DossiersService,
private readonly _fileManagementService: FileManagementService,
private readonly _dictionaryService: DictionaryService,
private readonly _translateService: TranslateService,
private readonly _loadingService: LoadingService,
) {
const dossiersService = dossiersServiceResolver(_injector, router);
@ -112,6 +106,16 @@ export class FilePreviewStateService {
this.#reloadBlob$.next(true);
}
#getRemainingTimeVerbose(event: HttpProgressEvent, startTime: number) {
const remainingTime = getRemainingTime(event, startTime);
if (remainingTime > 60) {
const minutes: string = this._translateService.instant('minutes');
return `${Math.round(remainingTime / 60)} ${minutes}`;
}
const seconds: string = this._translateService.instant('seconds');
return `${remainingTime} ${seconds}`;
}
#dossierFilesChange$() {
return this._dossiersService.dossierFileChanges$.pipe(
filter(dossierId => dossierId === this.dossierId),
@ -144,11 +148,12 @@ export class FilePreviewStateService {
#updateDownloadProgress(event: HttpProgressEvent, startTime: number) {
const progress = Math.round((event.loaded / event.total) * 100);
const loading: string = this._translateService.instant('loading');
this._loadingService.update({
title: 'Loading ' + this.file.filename,
title: loading + ' ' + this.file.filename,
type: 'progress-bar',
value: progress,
remainingTime: getRemainingTimeVerbose(event, startTime),
remainingTime: this.#getRemainingTimeVerbose(event, startTime),
});
}
}

View File

@ -1598,6 +1598,7 @@
"usage-details": "Nutzungsdetails"
},
"license-information": "Lizenzinformationen",
"loading": "",
"manual-annotation": {
"dialog": {
"actions": {
@ -1631,6 +1632,7 @@
}
}
},
"minutes": "",
"notification": {
"assign-approver": "Sie wurden dem Dokument <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}<b> als Genehmiger zugewiesen!",
"assign-reviewer": "Sie wurden dem Dokument <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> im Dossier <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}<b> als Reviewer zugewiesen!",
@ -1925,6 +1927,7 @@
"placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen",
"this-dossier": "in diesem Dossier"
},
"seconds": "",
"size": "",
"smtp-auth-config": {
"actions": {

View File

@ -1598,6 +1598,7 @@
"usage-details": "Usage Details"
},
"license-information": "License Information",
"loading": "Loading",
"manual-annotation": {
"dialog": {
"actions": {
@ -1631,6 +1632,7 @@
}
}
},
"minutes": "minutes",
"notification": {
"assign-approver": "You have been assigned as approver for <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> in dossier: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>!",
"assign-reviewer": "You have been assigned as reviewer for <b>{fileHref, select, null{{fileName}} other{<a href=\"{fileHref}\" target=\"_blank\">{fileName}</a>}}</b> in dossier: <b>{dossierHref, select, null{{dossierName}} other{<a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a>}}</b>!",
@ -1925,6 +1927,7 @@
"placeholder": "Search documents...",
"this-dossier": "in this dossier"
},
"seconds": "seconds",
"size": "Size",
"smtp-auth-config": {
"actions": {