+
@@ -103,9 +103,9 @@
(action)="suggestRemoveAnnotations($event, true)"
*ngIf="annotationPermissions.canRemoveOrSuggestToRemoveFromDictionary"
[tooltipPosition]="tooltipPosition"
+ [tooltip]="'annotation-actions.remove-annotation.remove-from-dict' | translate"
[type]="btnType"
icon="red:remove-from-dict"
- tooltip="annotation-actions.remove-annotation.remove-from-dict"
>
@@ -113,9 +113,9 @@
(action)="markAsFalsePositive($event)"
*ngIf="annotationPermissions.canMarkAsFalsePositive"
[tooltipPosition]="tooltipPosition"
+ [tooltip]="'annotation-actions.remove-annotation.false-positive' | translate"
[type]="btnType"
icon="red:thumb-down"
- tooltip="annotation-actions.remove-annotation.false-positive"
>
@@ -123,9 +123,9 @@
(action)="suggestRemoveAnnotations($event, false)"
*ngIf="annotationPermissions.canRemoveOrSuggestToRemoveOnlyHere"
[tooltipPosition]="tooltipPosition"
+ [tooltip]="'annotation-actions.remove-annotation.only-here' | translate"
[type]="btnType"
icon="red:trash"
- tooltip="annotation-actions.remove-annotation.only-here"
>
diff --git a/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.html b/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.html
index 4b2b05229..9c41e2e5d 100644
--- a/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.html
@@ -2,8 +2,8 @@
@@ -18,8 +18,8 @@
@@ -27,8 +27,8 @@
@@ -36,8 +36,8 @@
@@ -49,7 +49,7 @@
(action)="approveDocuments()"
*ngIf="isReadyForApproval"
[disabled]="!canApprove"
- [tooltip]="canApprove ? 'dossier-overview.approve' : 'dossier-overview.approve-disabled'"
+ [tooltip]="canApprove ? ('dossier-overview.approve' | translate) : ('dossier-overview.approve-disabled' | translate)"
icon="red:approved"
type="dark-bg"
>
@@ -59,8 +59,8 @@
@@ -68,16 +68,16 @@
diff --git a/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts b/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts
index 47f2dfe2b..02053f8dd 100644
--- a/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/bulk-actions/dossier-overview-bulk-actions.component.ts
@@ -10,6 +10,7 @@ import { StatusOverlayService } from '@upload-download/services/status-overlay.s
import { DossiersDialogService } from '../../services/dossiers-dialog.service';
import { LoadingService } from '@services/loading.service';
import { ConfirmationDialogInput } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component';
+import { TranslateService } from '@ngx-translate/core';
@Component({
selector: 'redaction-dossier-overview-bulk-actions',
@@ -32,7 +33,8 @@ export class DossierOverviewBulkActionsComponent {
private readonly _fileActionService: FileActionService,
private readonly _statusOverlayService: StatusOverlayService,
private readonly _changeDetectorRef: ChangeDetectorRef,
- private readonly _loadingService: LoadingService
+ private readonly _loadingService: LoadingService,
+ private readonly _translateService: TranslateService
) {}
get dossier() {
@@ -125,7 +127,9 @@ export class DossierOverviewBulkActionsComponent {
get assignTooltip() {
const allFilesAreUnderApproval = this.selectedFiles.reduce((acc, file) => acc && file.isUnderApproval, true);
- return allFilesAreUnderApproval ? 'dossier-overview.assign-approver' : 'dossier-overview.assign-reviewer';
+ return allFilesAreUnderApproval
+ ? this._translateService.instant('dossier-overview.assign-approver')
+ : this._translateService.instant('dossier-overview.assign-reviewer');
}
delete() {
diff --git a/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.html b/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.html
index 0558d76b6..bd02b1ad1 100644
--- a/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.html
@@ -2,14 +2,14 @@
diff --git a/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.html
index da86fc640..62a7c0101 100644
--- a/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.html
@@ -1,12 +1,16 @@
@@ -18,9 +22,9 @@
@@ -80,11 +84,11 @@
>
-
+
diff --git a/apps/red-ui/src/app/modules/dossier/components/dossier-listing-actions/dossier-listing-actions.component.html b/apps/red-ui/src/app/modules/dossier/components/dossier-listing-actions/dossier-listing-actions.component.html
index 382643c84..b78c711d0 100644
--- a/apps/red-ui/src/app/modules/dossier/components/dossier-listing-actions/dossier-listing-actions.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/dossier-listing-actions/dossier-listing-actions.component.html
@@ -3,16 +3,16 @@
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html
index 0f339b53a..888a9b680 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html
@@ -14,9 +14,9 @@
(action)="openDeleteFileDialog($event)"
*ngIf="permissionsService.canDeleteFile(fileStatus)"
[tooltipPosition]="tooltipPosition"
+ [tooltip]="'dossier-overview.delete.action' | translate"
[type]="buttonType"
icon="red:trash"
- tooltip="dossier-overview.delete.action"
>
@@ -50,8 +50,8 @@
(action)="toggleViewDocumentInfo()"
*ngIf="screen === 'file-preview'"
[attr.aria-expanded]="activeDocumentInfo"
+ [tooltip]="'file-preview.document-info' | translate"
icon="red:status-info"
- tooltip="file-preview.document-info"
tooltipPosition="below"
>
@@ -60,8 +60,8 @@
*ngIf="screen === 'file-preview'"
[attr.aria-expanded]="activeExcludePages"
[showDot]="!!fileStatus.excludedPages?.length"
+ [tooltip]="'file-preview.exclude-pages' | translate"
icon="red:exclude-pages"
- tooltip="file-preview.exclude-pages"
tooltipPosition="below"
>
@@ -70,9 +70,9 @@
(action)="setFileUnderApproval($event)"
*ngIf="canSetToUnderApproval"
[tooltipPosition]="tooltipPosition"
+ [tooltip]="'dossier-overview.under-approval' | translate"
[type]="buttonType"
icon="red:ready-for-approval"
- tooltip="dossier-overview.under-approval"
>
@@ -80,9 +80,9 @@
(action)="setFileUnderReview($event, true)"
*ngIf="canSetToUnderReview"
[tooltipPosition]="tooltipPosition"
+ [tooltip]="'dossier-overview.under-review' | translate"
[type]="buttonType"
icon="red:undo"
- tooltip="dossier-overview.under-review"
>
@@ -91,7 +91,11 @@
*ngIf="permissionsService.isReadyForApproval(fileStatus)"
[disabled]="!permissionsService.canApprove(fileStatus)"
[tooltipPosition]="tooltipPosition"
- [tooltip]="permissionsService.canApprove(fileStatus) ? 'dossier-overview.approve' : 'dossier-overview.approve-disabled'"
+ [tooltip]="
+ permissionsService.canApprove(fileStatus)
+ ? ('dossier-overview.approve' | translate)
+ : ('dossier-overview.approve-disabled' | translate)
+ "
[type]="buttonType"
icon="red:approved"
>
@@ -101,26 +105,26 @@
(action)="setFileUnderApproval($event)"
*ngIf="canUndoApproval"
[tooltipPosition]="tooltipPosition"
+ [tooltip]="'dossier-overview.under-approval' | translate"
[type]="buttonType"
icon="red:undo"
- tooltip="dossier-overview.under-approval"
>
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.ts
index b5820b64e..f988ce319 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.ts
@@ -7,6 +7,7 @@ import { DossiersDialogService } from '../../services/dossiers-dialog.service';
import { ConfirmationDialogInput } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component';
import { LoadingService } from '@services/loading.service';
import { FileManagementControllerService } from '@redaction/red-ui-http';
+import { TranslateService } from '@ngx-translate/core';
@Component({
selector: 'redaction-file-actions',
@@ -28,7 +29,8 @@ export class FileActionsComponent implements OnInit {
private readonly _dialogService: DossiersDialogService,
private readonly _fileActionService: FileActionService,
private readonly _loadingService: LoadingService,
- private readonly _fileManagementControllerService: FileManagementControllerService
+ private readonly _fileManagementControllerService: FileManagementControllerService,
+ private readonly _translateService: TranslateService
) {}
get statusBarConfig() {
@@ -84,7 +86,9 @@ export class FileActionsComponent implements OnInit {
}
get assignTooltip() {
- return this.fileStatus.isUnderApproval ? 'dossier-overview.assign-approver' : 'dossier-overview.assign-reviewer';
+ return this.fileStatus.isUnderApproval
+ ? this._translateService.instant('dossier-overview.assign-approver')
+ : this._translateService.instant('dossier-overview.assign-reviewer');
}
ngOnInit(): void {
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
index 396cd8b6d..3432287b6 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
@@ -20,8 +20,8 @@
@@ -99,7 +99,7 @@
-
+
{{ activeViewerPage }} -
{{ activeAnnotationsLength || 0 }}
@@ -165,10 +165,10 @@
diff --git a/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.html b/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.html
index 771164b19..8e3605d22 100644
--- a/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.html
@@ -20,12 +20,12 @@
{{ range.startPage }}
-
{{ range.startPage }}-{{ range.endPage }}
+
{{ range.startPage }} -{{ range.endPage }}
diff --git a/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.html b/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.html
index 08774a997..026b87721 100644
--- a/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.html
@@ -19,9 +19,9 @@
*ngIf="permissionsService.isManager() && canAdd"
[class.large-spacing]="largeSpacing"
[size]="32"
+ [tooltip]="'dossier-details.assign-members' | translate"
class="member"
icon="red:plus"
- tooltip="dossier-details.assign-members"
type="primary"
>
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html
index 4ae754bea..ded16d096 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html
@@ -74,14 +74,14 @@
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
index f00f3a050..91535d836 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
@@ -32,7 +32,7 @@
-
+
{{ status | translate }}
@@ -74,8 +74,8 @@
@@ -97,8 +97,8 @@
@@ -106,9 +106,9 @@
@@ -118,9 +118,9 @@
(action)="closeFullScreen()"
*ngIf="!fullScreen"
[routerLink]="['/main/dossiers/' + appStateService.activeDossierId]"
+ [tooltip]="'common.close' | translate"
class="ml-8"
icon="red:close"
- tooltip="common.close"
tooltipPosition="below"
>
@@ -177,17 +177,17 @@
[dialogRef]="dialogRef"
[excludePages]="excludePages"
[fileData]="fileData"
- [viewer]="activeViewer"
[hideSkipped]="hideSkipped"
[primaryFilters]="primaryFilters"
[secondaryFilters]="secondaryFilters"
[selectedAnnotations]="selectedAnnotations"
+ [viewer]="activeViewer"
>
-
+
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.html b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.html
index f16c8ed14..84679d1c8 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.html
@@ -1,4 +1,4 @@
-
+
diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html
index 31ec0b241..a35236909 100644
--- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html
@@ -1,23 +1,17 @@
-