(item => ({
key: item,
- label: this._translateService.instant('filter.' + item)
+ label: workloadTranslations[item]
}));
this.filterService.addFilterGroup({
diff --git a/apps/red-ui/src/app/modules/dossier/translations/workload-translations.ts b/apps/red-ui/src/app/modules/dossier/translations/workload-translations.ts
new file mode 100644
index 000000000..eea3c5668
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/translations/workload-translations.ts
@@ -0,0 +1,11 @@
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+
+export const workloadTranslations: { [key: string]: string } = {
+ analysis: _('filter.analysis'),
+ hint: _('filter.hint'),
+ image: _('filter.image'),
+ none: _('filter.none'),
+ redaction: _('filter.redaction'),
+ suggestion: _('filter.suggestion'),
+ updated: _('filter.updated')
+};
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 af8c784fc..09e4aa6af 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
@@ -19,7 +19,7 @@
{{ displayedDataTotal }}
-
{{ subtitle | translate }}
+
{{ subtitle }}
diff --git a/apps/red-ui/src/app/modules/shared/pipes/date.pipe.ts b/apps/red-ui/src/app/modules/shared/pipes/date.pipe.ts
index fe9f71c85..6b0a34b6f 100644
--- a/apps/red-ui/src/app/modules/shared/pipes/date.pipe.ts
+++ b/apps/red-ui/src/app/modules/shared/pipes/date.pipe.ts
@@ -31,23 +31,17 @@ export class DatePipe extends BaseDatePipe implements PipeTransform {
const minutesFromNow = date.diff(now, 'minutes');
const minutesLeft = minutesFromNow - HOURS_IN_A_DAY * MINUTES_IN_AN_HOUR * daysLeft;
- if (daysLeft === 0 && hoursLeft === 0 && minutesLeft > 0) return this._translate('time.less-than-an-hour');
+ if (daysLeft === 0 && hoursLeft === 0 && minutesLeft > 0) return this._translateService.instant('time.less-than-an-hour');
- const hoursSuffix = this._translate(`time.hour${hoursLeft === 1 ? '' : 's'}`);
- const hoursDisplay = `${hoursLeft} ${hoursSuffix}`;
+ const hoursDisplay = this._translateService.instant('time.hours', { hours: hoursLeft });
if (daysLeft === 0 && hoursLeft > 0) return hoursDisplay;
- const daysSuffix = this._translate(`time.day${daysLeft === 1 ? '' : 's'}`);
- const daysDisplay = `${daysLeft} ${daysSuffix}`;
+ const daysDisplay = this._translateService.instant('time.days', { days: daysLeft });
if (daysLeft > 0 && hoursLeft > 0) return `${daysDisplay} ${hoursDisplay}`;
if (daysLeft > 0) return daysDisplay;
- return this._translate(`time.no-time-left`);
- }
-
- private _translate(value: string, params?: { [key: string]: string }) {
- return this._translateService.instant(value, params);
+ return this._translateService.instant(`time.no-time-left`);
}
}
diff --git a/apps/red-ui/src/app/utils/missing-translations-handler.ts b/apps/red-ui/src/app/utils/missing-translations-handler.ts
index b6b871c45..436d0ba02 100644
--- a/apps/red-ui/src/app/utils/missing-translations-handler.ts
+++ b/apps/red-ui/src/app/utils/missing-translations-handler.ts
@@ -4,6 +4,6 @@ export class REDMissingTranslationHandler implements MissingTranslationHandler {
handle(params: MissingTranslationHandlerParams): any {
const missingKey = params.key;
console.error('Missing translation: ' + missingKey);
- return missingKey;
+ return `?${missingKey}?`;
}
}
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 3319b987e..fa4c2bc2a 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -1236,21 +1236,11 @@
},
"title": "Configure SMTP Account"
},
- "sorting": {
- "alphabetically": "Alphabetically",
- "custom": "Custom",
- "number-of-analyses": "Number of analyses",
- "number-of-pages": "Number of pages",
- "oldest": "Oldest",
- "recent": "Recent"
- },
"submitted": "Submitted",
"suggestion": "Suggestion for redaction",
"time": {
- "day": "day",
- "days": "days",
- "hour": "hour",
- "hours": "hours",
+ "hours": "{hours} {hours, plural, one{hour} other{hours}}",
+ "days": "{days} {days, plural, one{day} other{days}}",
"less-than-an-hour": "< 1 hour",
"no-time-left": "Time to restore already passed"
},
diff --git a/apps/red-ui/src/assets/i18n/te.json b/apps/red-ui/src/assets/i18n/te.json
index b9cbf4cad..d36837b91 100644
--- a/apps/red-ui/src/assets/i18n/te.json
+++ b/apps/red-ui/src/assets/i18n/te.json
@@ -358,6 +358,7 @@
}
},
"content": "",
+ "default-colors": "",
"default-colors-screen": {
"action": {
"edit": ""
@@ -382,6 +383,7 @@
}
},
"dev-mode": "",
+ "dictionaries": "",
"dictionary-listing": {
"action": {
"delete": "",
@@ -402,7 +404,8 @@
"search": "",
"stats": {
"charts": {
- "entries": ""
+ "entries": "",
+ "types": ""
}
},
"table-col-names": {
@@ -474,6 +477,7 @@
"number": "",
"text": ""
},
+ "dossier-attributes": "",
"dossier-attributes-listing": {
"action": {
"edit": ""
@@ -539,6 +543,10 @@
"search": "",
"stats": {
"analyzed-pages": "",
+ "charts": {
+ "dossiers": "",
+ "total-documents": ""
+ },
"total-people": ""
},
"table-col-names": {
@@ -567,6 +575,9 @@
"image-uploaded": "",
"show-less": ""
},
+ "charts": {
+ "documents-in-dossier": ""
+ },
"description": "",
"dictionary": "",
"stats": {
@@ -734,6 +745,7 @@
"number": "",
"text": ""
},
+ "file-attributes": "",
"file-attributes-csv-import": {
"action": {
"cancel-edit-name": "",
@@ -878,6 +890,15 @@
"filter-types": "",
"label": ""
},
+ "filter": {
+ "analysis": "",
+ "hint": "",
+ "image": "",
+ "none": "",
+ "redaction": "",
+ "suggestion": "",
+ "updated": ""
+ },
"filters": {
"assigned-people": "",
"dossier-templates": "",
@@ -1006,6 +1027,7 @@
"report-type": {
"label": ""
},
+ "reports": "",
"reports-screen": {
"description": "",
"document-setup-description": "",
@@ -1035,6 +1057,7 @@
"red-user-admin": "",
"regular": ""
},
+ "rule-editor": "",
"rules-screen": {
"revert-changes": "",
"save-changes": ""
@@ -1087,18 +1110,28 @@
"subtitle": "",
"title": ""
},
+ "time": {
+ "days": "",
+ "hours": "",
+ "less-than-an-hour": "",
+ "no-time-left": ""
+ },
"top-bar": {
"navigation-items": {
"back": "",
"dossiers": "",
"my-account": {
"children": {
+ "admin": "",
+ "downloads": "",
"language": {
"de": "",
"en": "",
"label": ""
},
- "logout": ""
+ "logout": "",
+ "my-profile": "",
+ "trash": ""
}
}
}
@@ -1180,12 +1213,19 @@
"title": ""
},
"user-stats": {
+ "chart": {
+ "users": ""
+ },
"collapse": "",
"expand": "",
"title": ""
},
+ "watermark": "",
"watermark-screen": {
"action": {
+ "change-success": "",
+ "delete-success": "",
+ "error": "",
"revert": "",
"save": ""
},