From 1f5b567070ac922c9b061c00906e7c572ca6b8c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 19 Jul 2021 21:33:19 +0300 Subject: [PATCH] Translation rework: Default colors --- .../src/app/models/default-color-key.model.ts | 10 + .../edit-color-dialog.component.ts | 5 +- .../default-colors-screen.component.ts | 3 +- .../default-color-translations.ts | 16 ++ apps/red-ui/src/assets/i18n/te.json | 218 ++++++++++++++++-- 5 files changed, 234 insertions(+), 18 deletions(-) create mode 100644 apps/red-ui/src/app/models/default-color-key.model.ts create mode 100644 apps/red-ui/src/app/modules/admin/translations/default-color-translations.ts diff --git a/apps/red-ui/src/app/models/default-color-key.model.ts b/apps/red-ui/src/app/models/default-color-key.model.ts new file mode 100644 index 000000000..086eade16 --- /dev/null +++ b/apps/red-ui/src/app/models/default-color-key.model.ts @@ -0,0 +1,10 @@ +export type DefaultColorType = + | 'analysisColor' + | 'defaultColor' + | 'dictionaryRequestColor' + | 'manualRedactionColor' + | 'notRedacted' + | 'previewColor' + | 'requestAdd' + | 'requestRemove' + | 'updatedColor'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts index 37ce4623e..67df7c56d 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts @@ -4,6 +4,7 @@ import { Colors, DictionaryControllerService } from '@redaction/red-ui-http'; import { NotificationService, NotificationType } from '@services/notification.service'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; +import { DefaultColorType } from '@models/default-color-key.model'; @Component({ selector: 'redaction-edit-color-dialog', @@ -12,7 +13,7 @@ import { TranslateService } from '@ngx-translate/core'; }) export class EditColorDialogComponent { readonly colors: Colors; - readonly colorKey: string; + readonly colorKey: DefaultColorType; colorForm: FormGroup; private readonly _initialColor: string; private readonly _dossierTemplateId: string; @@ -24,7 +25,7 @@ export class EditColorDialogComponent { private readonly _translateService: TranslateService, private readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) - private readonly _data: { colors: Colors; colorKey: string; dossierTemplateId: string } + private readonly _data: { colors: Colors; colorKey: DefaultColorType; dossierTemplateId: string } ) { this.colors = _data.colors; this.colorKey = _data.colorKey; diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts index cc63d6124..eb2ba49ce 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts @@ -10,6 +10,7 @@ import { SearchService } from '@shared/services/search.service'; import { ScreenStateService } from '@shared/services/screen-state.service'; import { ScreenNames, SortingService } from '@services/sorting.service'; import { BaseListingComponent } from '@shared/base/base-listing.component'; +import { DefaultColorType } from '@models/default-color-key.model'; @Component({ templateUrl: './default-colors-screen.component.html', @@ -43,7 +44,7 @@ export class DefaultColorsScreenComponent await this._loadColors(); } - openEditColorDialog($event: any, color: { key: string; value: string }) { + openEditColorDialog($event: any, color: { key: DefaultColorType; value: string }) { this._dialogService.openDialog( 'editColor', $event, diff --git a/apps/red-ui/src/app/modules/admin/translations/default-color-translations.ts b/apps/red-ui/src/app/modules/admin/translations/default-color-translations.ts new file mode 100644 index 000000000..fe4b1b65c --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/translations/default-color-translations.ts @@ -0,0 +1,16 @@ +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { DefaultColorType } from '@models/default-color-key.model'; + +const translations: { [key in DefaultColorType]: string } = { + analysisColor: _('default-colors-screen.types.analysisColor'), + defaultColor: _('default-colors-screen.types.defaultColor'), + dictionaryRequestColor: _('default-colors-screen.types.dictionaryRequestColor'), + manualRedactionColor: _('default-colors-screen.types.manualRedactionColor'), + notRedacted: _('default-colors-screen.types.notRedacted'), + previewColor: _('default-colors-screen.types.previewColor'), + requestAdd: _('default-colors-screen.types.requestAdd'), + requestRemove: _('default-colors-screen.types.requestRemove'), + updatedColor: _('default-colors-screen.types.updatedColor') +}; + +export default translations; diff --git a/apps/red-ui/src/assets/i18n/te.json b/apps/red-ui/src/assets/i18n/te.json index 987fe13a8..a1f76881c 100644 --- a/apps/red-ui/src/assets/i18n/te.json +++ b/apps/red-ui/src/assets/i18n/te.json @@ -13,7 +13,8 @@ }, "add-dossier-dialog": { "actions": { - "save": "" + "save": "", + "save-and-add-members": "" }, "errors": { "dossier-already-exists": "", @@ -99,6 +100,7 @@ "add-edit-user": { "actions": { "cancel": "", + "delete": "", "save": "", "save-changes": "" }, @@ -122,6 +124,9 @@ "accept-suggestion": { "label": "" }, + "edit-reason": { + "label": "" + }, "force-redaction": { "label": "" }, @@ -133,6 +138,7 @@ "only-here": "", "remove-from-dict": "" }, + "show": "", "undo": "" }, "annotations": "", @@ -144,9 +150,14 @@ "no-approvers": "", "no-reviewers": "", "reviewers": "", + "search": "", "single-user": "" } }, + "assign-user": { + "cancel": "", + "save": "" + }, "audit": "", "audit-screen": { "categories": { @@ -188,8 +199,18 @@ "header": "" }, "comments": { + "add-comment": "", "hide-comments": "" }, + "common": { + "close": "", + "confirmation-dialog": { + "confirm": "", + "deny": "", + "description": "", + "title": "" + } + }, "configurations": "", "confirm-delete-file-attribute": { "cancel": { @@ -199,17 +220,39 @@ "warning": "" }, "confirm-delete-users": { - "cancel": { - "": "" - }, - "title": { - "": "" - }, + "cancel": "", + "delete": "", + "impacted-documents": "", + "impacted-dossiers": "", + "title": "", "toast-error": "", "warning": "" }, + "confirmation-dialog": { + "assign-file-to-me": { + "question": "", + "title": "" + }, + "compare-file": { + "question": "", + "title": "" + }, + "delete-dossier": { + "confirmation-text": "", + "deny-text": "", + "question": "", + "title": "" + }, + "delete-file": { + "question": "", + "title": "" + } + }, "content": "", "default-colors-screen": { + "action": { + "edit": "" + }, "table-col-names": { "color": "", "key": "" @@ -218,11 +261,28 @@ "title": "" }, "types": { - "": "" + "": "", + "analysisColor": "", + "defaultColor": "", + "dictionaryRequestColor": "", + "manualRedactionColor": "", + "notRedacted": "", + "previewColor": "", + "requestAdd": "", + "requestRemove": "", + "updatedColor": "" } }, "dev-mode": "", "dictionary-listing": { + "action": { + "delete": "", + "edit": "" + }, + "add-new": "", + "bulk": { + "delete": "" + }, "case-sensitive": "", "no-data": { "action": "", @@ -231,6 +291,7 @@ "no-match": { "title": "" }, + "search": "", "stats": { "charts": { "entries": "" @@ -246,6 +307,12 @@ } }, "dictionary-overview": { + "action": { + "delete": "", + "download": "", + "edit": "", + "upload": "" + }, "compare": { "compare": "" }, @@ -257,6 +324,7 @@ "generic": "" }, "revert-changes": "", + "save-changes": "", "search": "", "select-dictionary": "", "success": { @@ -267,9 +335,11 @@ "digital-signature-screen": { "action": { "certificate-not-valid-error": "", + "delete": "", "delete-error": "", "delete-success": "", "reset": "", + "save": "", "save-error": "", "save-success": "" }, @@ -303,6 +373,13 @@ "title": "" }, "dossier-attributes-listing": { + "action": { + "edit": "" + }, + "add-new": "", + "bulk": { + "delete": "" + }, "no-data": { "action": "", "title": "" @@ -310,6 +387,7 @@ "no-match": { "title": "" }, + "search": "", "table-col-names": { "label": "", "type": "" @@ -319,6 +397,8 @@ } }, "dossier-details": { + "assign-members": "", + "edit-owner": "", "members": "", "owner": "", "see-less": "", @@ -331,6 +411,12 @@ }, "dossier-listing": { "add-new": "", + "delete": { + "action": "" + }, + "edit": { + "action": "" + }, "no-data": { "action": "", "title": "" @@ -344,6 +430,9 @@ "to-approve": "", "to-review": "" }, + "reanalyse": { + "action": "" + }, "search": "", "stats": { "analyzed-pages": "", @@ -360,6 +449,18 @@ } }, "dossier-overview": { + "approve": "", + "approve-disabled": "", + "assign-approver": "", + "assign-me": "", + "assign-reviewer": "", + "bulk": { + "delete": "", + "reanalyse": "" + }, + "delete": { + "action": "" + }, "dossier-details": { "attributes": { "expand": "", @@ -376,6 +477,8 @@ "people": "" } }, + "download-file": "", + "download-file-disabled": "", "file-listing": { "file-entry": { "file-error": "", @@ -401,6 +504,7 @@ "no-match": { "title": "" }, + "ocr-file": "", "ocr-performed": "", "quick-filters": { "assigned-to-me": "", @@ -412,6 +516,9 @@ "error": "", "success": "" }, + "reanalyse": { + "action": "" + }, "search": "", "table-col-names": { "added-on": "", @@ -424,10 +531,20 @@ "table-header": { "title": "" }, + "under-approval": "", + "under-review": "", "upload-files": "" }, "dossier-templates": "", "dossier-templates-listing": { + "action": { + "delete": "", + "edit": "" + }, + "add-new": "", + "bulk": { + "delete": "" + }, "dictionaries": "", "no-data": { "title": "" @@ -435,6 +552,7 @@ "no-match": { "title": "" }, + "search": "", "table-col-names": { "created-by": "", "created-on": "", @@ -458,6 +576,10 @@ "label": "" }, "downloads-list": { + "actions": { + "delete": "", + "download": "" + }, "no-data": { "title": "" }, @@ -487,7 +609,9 @@ }, "attributes": { "custom-attributes": "", - "image-attributes": "" + "delete-image": "", + "image-attributes": "", + "upload-image": "" }, "change-successful": "", "delete-successful": "", @@ -511,7 +635,14 @@ }, "header": "", "nav-items": { - "": "" + "choose-download": "", + "dossier-attributes": "", + "dossier-dictionary": "", + "dossier-info": "", + "download-package": "", + "general-info": "", + "members": "", + "team-members": "" }, "unsaved-changes": "" }, @@ -519,6 +650,12 @@ "": "" }, "file-attributes-csv-import": { + "action": { + "cancel-edit-name": "", + "edit-name": "", + "remove": "", + "save-name": "" + }, "available": "", "cancel": "", "delimiter": "", @@ -533,6 +670,7 @@ }, "no-hovered-column": "", "no-sample-data-for": "", + "parse-csv": "", "quick-activation": { "all": "", "none": "" @@ -542,6 +680,9 @@ "label": "", "success": "" }, + "search": { + "placeholder": "" + }, "selected": "", "table-col-names": { "name": "", @@ -553,7 +694,9 @@ "table-header": { "actions": { "disable-read-only": "", - "enable-read-only": "" + "enable-read-only": "", + "read-only": "", + "remove-selected": "" }, "title": "" }, @@ -561,6 +704,14 @@ "total-rows": "" }, "file-attributes-listing": { + "action": { + "delete": "", + "edit": "" + }, + "add-new": "", + "bulk-actions": { + "delete": "" + }, "no-data": { "title": "" }, @@ -568,6 +719,7 @@ "title": "" }, "read-only": "", + "search": "", "table-col-names": { "csv-column": "", "name": "", @@ -578,13 +730,20 @@ }, "table-header": { "title": "" - } + }, + "upload-csv": "" }, "file-preview": { + "assign-me": "", "assign-reviewer": "", + "change-reviewer": "", "delta": "", "delta-tooltip": "", + "document-info": "", + "download-original-file": "", + "exclude-pages": "", "excluded-from-redaction": "", + "fullscreen": "", "last-reviewer": "", "no-data": { "title": "" @@ -593,12 +752,15 @@ "jump-first": "", "jump-last": "" }, + "reanalyse-notification": "", "redacted": "", "redacted-tooltip": "", "standard": "", "standard-tooltip": "", "tabs": { "annotations": { + "jump-to-next": "", + "jump-to-previous": "", "label": "", "page-is": "", "select": "", @@ -606,18 +768,24 @@ "select-none": "" }, "document-info": { + "close": "", "details": { "created-on": "", "dossier": "", "due": "", "pages": "" }, + "edit": "", "label": "" }, "exclude-pages": { + "close": "", "error": "", + "hint": "", + "input-placeholder": "", "label": "", "no-excluded": "", + "put-back": "", "removed-from-redaction": "" } } @@ -704,7 +872,8 @@ "options": { "cancel": "", "overwrite": "", - "remember": "" + "remember": "", + "skip": "" }, "question": "", "title": "" @@ -781,6 +950,7 @@ "generic": "" }, "revert-changes": "", + "save-changes": "", "success": { "generic": "" } @@ -799,7 +969,8 @@ }, "smtp-config-screen": { "actions": { - "save": "" + "save": "", + "test-connection": "" }, "form": { "auth": "", @@ -878,6 +1049,10 @@ }, "upload-status": { "dialog": { + "actions": { + "cancel": "", + "re-upload": "" + }, "title": "" }, "error": { @@ -886,9 +1061,19 @@ } }, "user-listing": { + "action": { + "delete": "", + "edit": "" + }, + "add-new": "", + "bulk": { + "delete": "", + "delete-disabled": "" + }, "no-match": { "title": "" }, + "search": "", "table-col-names": { "active": "", "email": "", @@ -913,6 +1098,8 @@ "title": "" }, "user-stats": { + "collapse": "", + "expand": "", "title": "" }, "watermark-screen": { @@ -920,7 +1107,8 @@ "change-success": "", "delete-success": "", "error": "", - "revert": "" + "revert": "", + "save": "" }, "form": { "color": "",