diff --git a/.eslintrc.json b/.eslintrc.json index cf034af7e..41d05771e 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -20,8 +20,8 @@ "@models/**", "@environments/**", "@shared/**", - "@app-config/**", - "@upload-download/**" + "@upload-download/**", + "@translations/**" ], "depConstraints": [ { diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index 0ce9794ae..2bde17f99 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -1,4 +1,4 @@ -import { annotationTypesTranslations, SuggestionAddFalsePositive } from '../../translations/annotation-types-translations'; +import { annotationTypesTranslations, SuggestionAddFalsePositive } from '@translations/annotation-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Highlight, IComment, IManualChange, IPoint, IRectangle, LogEntryStatus, ManualRedactionType } from '@red/domain'; import { RedactionLogEntry } from '@models/file/redaction-log.entry'; diff --git a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts index c87363a82..2bb8b28f8 100644 --- a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts +++ b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, OnInit, ViewContainerRef } from '@angular/core'; import { Router } from '@angular/router'; -import { notificationsTranslations } from '../translations/notifications-translations'; +import { accountTranslations } from '@translations/account-translations'; @Component({ selector: 'redaction-base-account-screen', @@ -9,8 +9,8 @@ import { notificationsTranslations } from '../translations/notifications-transla changeDetection: ChangeDetectionStrategy.OnPush, }) export class BaseAccountScreenComponent implements OnInit { - readonly translations = notificationsTranslations; - path: string; + readonly translations = accountTranslations; + readonly path: string; constructor(private readonly _router: Router, private readonly _hostRef: ViewContainerRef) { this.path = this._router.url.split('/').pop(); diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts index 26e1acfd4..a953d41c1 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts @@ -1,6 +1,5 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { notificationsTranslations } from '../../../translations/notifications-translations'; import { NotificationPreferencesService } from '../../../services/notification-preferences.service'; import { BaseFormComponent, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -11,9 +10,9 @@ import { NotificationGroupsValues, } from '@red/domain'; import { firstValueFrom } from 'rxjs'; +import { notificationsSettingsTranslations } from '@translations/notifications-settings-translations'; @Component({ - selector: 'redaction-notifications-screen', templateUrl: './notifications-screen.component.html', styleUrls: ['./notifications-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, @@ -23,7 +22,7 @@ export class NotificationsScreenComponent extends BaseFormComponent implements O readonly notificationCategories = NotificationCategoriesValues; readonly notificationGroupsKeys = NotificationGroupsKeys; readonly notificationGroupsValues = NotificationGroupsValues; - readonly translations = notificationsTranslations; + readonly translations = notificationsSettingsTranslations; constructor( private readonly _toaster: Toaster, diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts index 8960ad039..176c40a34 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts @@ -4,7 +4,7 @@ import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { BaseFormComponent, LoadingService } from '@iqser/common-ui'; import { IProfile } from '@red/domain'; -import { languagesTranslations } from '../../../translations/languages-translations'; +import { languagesTranslations } from '@translations/languages-translations'; import { PermissionsService } from '@services/permissions.service'; import { UserService } from '@services/user.service'; import { ConfigService } from '@services/config.service'; diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts index e8b16024c..5efadeea0 100644 --- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts +++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts @@ -1,7 +1,7 @@ import { Component, HostBinding, Input, OnInit } from '@angular/core'; import { UserPreferenceService } from '@services/user-preference.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { adminSideNavTranslations } from '../translations/admin-side-nav-translations'; +import { adminSideNavTranslations } from '@translations/admin-side-nav-translations'; import { UserService } from '@services/user.service'; import { ActivatedRoute } from '@angular/router'; import { AdminSideNavType, AdminSideNavTypes, ENTITY_TYPE } from '@red/domain'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts index 1c1e6b7ee..85d308415 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts @@ -5,7 +5,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { BaseDialogComponent, IqserEventTarget, LoadingService, Toaster } from '@iqser/common-ui'; import { HttpErrorResponse } from '@angular/common/http'; import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; -import { dossierAttributeTypesTranslations } from '../../translations/dossier-attribute-types-translations'; +import { dossierAttributeTypesTranslations } from '@translations/dossier-attribute-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @Component({ diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts index e98272044..912338014 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, Injector } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { applyIntervalConstraints } from '@utils/date-inputs-utils'; -import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; +import { downloadTypesTranslations } from '@translations/download-types-translations'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts index ebc79cfcf..d3272ca17 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/c import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { FileAttributeConfigTypes, IFileAttributeConfig } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { fileAttributeTypesTranslations } from '../../translations/file-attribute-types-translations'; +import { fileAttributeTypesTranslations } from '@translations/file-attribute-types-translations'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { BaseDialogComponent } from '@iqser/common-ui'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts index db3744411..a6a727295 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output } from '@a import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AdminDialogService } from '../../../services/admin-dialog.service'; import { BaseFormComponent, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; -import { rolesTranslations } from '../../../../../translations/roles-translations'; +import { rolesTranslations } from '@translations/roles-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { IProfileUpdateRequest, User } from '@red/domain'; import { UserService } from '@services/user.service'; 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 7c89dd81a..76ef7b7f5 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,7 +4,7 @@ import { DefaultColorType, IColors } from '@red/domain'; import { BaseDialogComponent, Toaster } from '@iqser/common-ui'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; -import { defaultColorsTranslations } from '../../translations/default-colors-translations'; +import { defaultColorsTranslations } from '@translations/default-colors-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DictionaryService } from '@services/entity-services/dictionary.service'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts index 45334ed9c..ed3d5232c 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/c import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { FileAttributeEncodingTypes, IFileAttributesConfig } from '@red/domain'; -import { fileAttributeEncodingTypesTranslations } from '../../translations/file-attribute-encoding-types-translations'; +import { fileAttributeEncodingTypesTranslations } from '@translations/file-attribute-encoding-types-translations'; import { BaseDialogComponent, Toaster } from '@iqser/common-ui'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts index f9b5f38ad..47303f061 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, forwardRef, Injector, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { CircleButtonTypes, DefaultListingServices, ListingComponent, TableColumnConfig } from '@iqser/common-ui'; -import { fileAttributeTypesTranslations } from '../../../translations/file-attribute-types-translations'; +import { fileAttributeTypesTranslations } from '@translations/file-attribute-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FileAttributeConfigTypes, IField } from '@red/domain'; diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts index 0d762101e..2d7f2c4f5 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts @@ -2,7 +2,7 @@ import { Component, forwardRef, Injector, OnDestroy, OnInit } from '@angular/cor import { FormBuilder, FormGroup } from '@angular/forms'; import { applyIntervalConstraints } from '@utils/date-inputs-utils'; import { DefaultListingServices, ListingComponent, LoadingService, TableColumnConfig } from '@iqser/common-ui'; -import { auditCategoriesTranslations } from '../../translations/audit-categories-translations'; +import { auditCategoriesTranslations } from '@translations/audit-categories-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { Audit, IAudit, IAuditResponse, IAuditSearchRequest } from '@red/domain'; 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 a53a3774f..ce8d058d5 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 @@ -9,7 +9,7 @@ import { LoadingService, TableColumnConfig, } from '@iqser/common-ui'; -import { defaultColorsTranslations } from '../../translations/default-colors-translations'; +import { defaultColorsTranslations } from '@translations/default-colors-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { DictionaryService } from '@services/entity-services/dictionary.service'; diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts index c22cf5c3e..faa594f40 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts @@ -10,7 +10,7 @@ import { } from '@iqser/common-ui'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; -import { dossierAttributeTypesTranslations } from '../../translations/dossier-attribute-types-translations'; +import { dossierAttributeTypesTranslations } from '@translations/dossier-attribute-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { DOSSIER_TEMPLATE_ID, DossierAttributeConfig, IDossierAttributeConfig } from '@red/domain'; diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts index e7532490a..2c9f4c4e7 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.ts @@ -3,7 +3,7 @@ import { DossierTemplate, DossierTemplateStats } from '@red/domain'; import { BehaviorSubject, Observable } from 'rxjs'; import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; import { switchMap } from 'rxjs/operators'; -import { dossierTemplateStatusTranslations } from '../../../translations/dossier-template-status-translations'; +import { dossierTemplateStatusTranslations } from '@translations/dossier-template-status-translations'; @Component({ selector: 'redaction-table-item [dossierTemplate]', diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts index 86985fe3a..d93717f5e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts @@ -19,7 +19,7 @@ import { TableColumnConfig, Toaster, } from '@iqser/common-ui'; -import { fileAttributeTypesTranslations } from '../../translations/file-attribute-types-translations'; +import { fileAttributeTypesTranslations } from '@translations/file-attribute-types-translations'; import { UserService } from '@services/user.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DOSSIER_TEMPLATE_ID, FileAttributeConfig, IFileAttributeConfig, IFileAttributesConfig, User } from '@red/domain'; diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts index 701d41570..0da291258 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.ts @@ -6,7 +6,7 @@ import { DOSSIER_TEMPLATE_ID, DossierTemplate, DossierTemplateStats } from '@red import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; import { AdminDialogService } from '../../../services/admin-dialog.service'; import { PermissionsService } from '@services/permissions.service'; -import { dossierTemplateStatusTranslations } from '../../../translations/dossier-template-status-translations'; +import { dossierTemplateStatusTranslations } from '@translations/dossier-template-status-translations'; @Component({ templateUrl: './dossier-template-info-screen.component.html', diff --git a/apps/red-ui/src/app/modules/admin/screens/permissions/config.service.ts b/apps/red-ui/src/app/modules/admin/screens/permissions/config.service.ts index d4b22c715..846024fd3 100644 --- a/apps/red-ui/src/app/modules/admin/screens/permissions/config.service.ts +++ b/apps/red-ui/src/app/modules/admin/screens/permissions/config.service.ts @@ -3,7 +3,7 @@ import { TableColumnConfig } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { PermissionsMapping } from '@red/domain'; import { PermissionsConfigurationMapService } from '@services/entity-permissions/permissions-configuration-map.service'; -import { permissionsTranslations } from '../../translations/permissions-translations'; +import { permissionsTranslations } from '@translations/permissions-translations'; @Injectable() export class ConfigService { diff --git a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts index d39ec4380..23e29aa0f 100644 --- a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts @@ -10,7 +10,7 @@ import { PermissionsConfigurationMapService } from '@services/entity-permissions import { firstValueFrom } from 'rxjs'; import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { tap } from 'rxjs/operators'; -import { permissionsTranslations } from '../../../translations/permissions-translations'; +import { permissionsTranslations } from '@translations/permissions-translations'; import { UserService } from '@services/user.service'; import { RouterHistoryService } from '@services/router-history.service'; diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts index 13860af28..5d54fbe82 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts @@ -6,7 +6,7 @@ import { PermissionsService } from '@services/permissions.service'; import { generalPlaceholdersDescriptionsTranslations, placeholdersDescriptionsTranslations, -} from '../../../translations/placeholders-descriptions-translations'; +} from '@translations/placeholders-descriptions-translations'; import { removeBraces } from '@utils/functions'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { AdminDialogService } from '../../../services/admin-dialog.service'; diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts index 7ae442fb7..8ad8b70c4 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts @@ -16,7 +16,7 @@ import { } from '@iqser/common-ui'; import { firstValueFrom, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { rolesTranslations } from '../../../../translations/roles-translations'; +import { rolesTranslations } from '@translations/roles-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { userTypeChecker, userTypeFilters } from '../../../../utils'; diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts index 261e7c10f..85f3bebd8 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts @@ -12,7 +12,7 @@ import { import { TranslateChartService } from '@services/translate-chart.service'; import { UserService } from '@services/user.service'; import { FilterService, ProgressBarConfigModel, shareLast, Toaster } from '@iqser/common-ui'; -import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ActivatedRoute } from '@angular/router'; import { firstValueFrom, Observable } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts index 4c81d4ecb..fc8c94544 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts @@ -12,14 +12,14 @@ import { WorkflowConfig, } from '@iqser/common-ui'; import { Dossier, File, IFileAttributeConfig, StatusSorter, WorkflowFileStatus, WorkflowFileStatuses } from '@red/domain'; -import { workflowFileStatusTranslations } from '../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { PermissionsService } from '@services/permissions.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; import { UserService } from '@services/user.service'; import { DossiersDialogService } from '../dossier/shared/services/dossiers-dialog.service'; import { annotationFilterChecker, RedactionFilterSorter } from '../../utils'; -import { workloadTranslations } from '../dossier/translations/workload-translations'; +import { workloadTranslations } from '@translations/workload-translations'; import { ConfigService as AppConfigService } from '@services/config.service'; import { BehaviorSubject, Observable } from 'rxjs'; import { BulkActionsService } from './services/bulk-actions.service'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 78d4443e0..075c4fe3e 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, Injector, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DOSSIER_TEMPLATE_ID, DownloadFileType, IDossierRequest, IDossierTemplate, IReportTemplate } from '@red/domain'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; +import { downloadTypesTranslations } from '@translations/download-types-translations'; import { BaseDialogComponent, IconButtonTypes, LoadingService, SaveOptions } from '@iqser/common-ui'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index 60a79f93f..7cb03d950 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { Dossier, DownloadFileType, IReportTemplate } from '@red/domain'; import { FormBuilder, FormGroup } from '@angular/forms'; import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface'; -import { downloadTypesTranslations } from '../../../../../translations/download-types-translations'; +import { downloadTypesTranslations } from '@translations/download-types-translations'; import { ReportTemplateService } from '@services/report-template.service'; import { PermissionsService } from '@services/permissions.service'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts index e3603fea0..a561060b2 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { SuperTypeSorter } from '@utils/sorters/super-type-sorter'; import { Filter, handleCheckedValue, IFilter, INestedFilter, NestedFilter } from '@iqser/common-ui'; -import { annotationTypesTranslations } from '../../../translations/annotation-types-translations'; +import { annotationTypesTranslations } from '@translations/annotation-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { IViewedPage } from '@red/domain'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; diff --git a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts index df6c1dcb1..f0a782079 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts @@ -5,9 +5,9 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; import { UserPreferenceService } from '@services/user-preference.service'; import { UserService } from '@services/user.service'; -import { workflowFileStatusTranslations } from '../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { dossierMemberChecker, dossierStateChecker, RedactionFilterSorter } from '../../utils'; -import { workloadTranslations } from '../dossier/translations/workload-translations'; +import { workloadTranslations } from '@translations/workload-translations'; import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; import { DossierStatesMapService } from '@services/entity-services/dossier-states-map.service'; import { DossiersDialogService } from '../dossier/shared/services/dossiers-dialog.service'; diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts index 98c6d1940..cb873d3a2 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { TranslateService } from '@ngx-translate/core'; -import { annotationChangesTranslations } from '../../../../translations/annotation-changes-translations'; +import { annotationChangesTranslations } from '@translations/annotation-changes-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { MultiSelectService } from '../../services/multi-select.service'; import { KeysOf, ListingService } from '@iqser/common-ui'; diff --git a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts index b2662eee7..4b7ed0e41 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Dossier, File, StatusBarConfigs, User } from '@red/domain'; import { List, LoadingService, Toaster } from '@iqser/common-ui'; import { PermissionsService } from '@services/permissions.service'; -import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { FilesService } from '@services/entity-services/files.service'; diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts index fe571896f..40d5fd376 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts @@ -6,7 +6,7 @@ import { BaseDialogComponent, LoadingService } from '@iqser/common-ui'; import { TextHighlightService } from '../../../dossier/services/text-highlight.service'; import { firstValueFrom } from 'rxjs'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; -import { highlightsTranslations } from '../../../../translations/highlights-translations'; +import { highlightsTranslations } from '@translations/highlights-translations'; export interface HighlightActionData { readonly operation: TextHighlightOperation; diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts index 910a627d4..2a1cfbbf6 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, Injector, OnInit } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; -import { imageCategoriesTranslations } from '../../../dossier/translations/image-categories-translations'; +import { imageCategoriesTranslations } from '@translations/image-categories-translations'; import { Dossier, ImageCategory } from '@red/domain'; import { BaseDialogComponent } from '@iqser/common-ui'; diff --git a/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts b/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts index d4421c017..46ac67e14 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/manual-redaction.service.ts @@ -14,7 +14,7 @@ import { type AnnotationWrapper } from '@models/file/annotation.wrapper'; import { GenericService, List, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; import { map, tap } from 'rxjs/operators'; import { PermissionsService } from '@services/permissions.service'; -import { dictionaryActionsTranslations, manualRedactionActionsTranslations } from '../../../translations/annotation-actions-translations'; +import { dictionaryActionsTranslations, manualRedactionActionsTranslations } from '@translations/annotation-actions-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; diff --git a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts index 5eb38d153..84c70726e 100644 --- a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts +++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts @@ -14,7 +14,7 @@ import { combineLatest, Observable, of } from 'rxjs'; import { debounceTime, map, startWith, switchMap, tap } from 'rxjs/operators'; import { ActivatedRoute, Router } from '@angular/router'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { workflowFileStatusTranslations } from '../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { TranslateService } from '@ngx-translate/core'; import { RouterHistoryService } from '@services/router-history.service'; import { Dossier, DOSSIERS_ARCHIVE, IMatchedDocument, ISearchListItem, ISearchResponse } from '@red/domain'; diff --git a/apps/red-ui/src/app/services/notifications.service.ts b/apps/red-ui/src/app/services/notifications.service.ts index 2356cd6c1..f2eed9725 100644 --- a/apps/red-ui/src/app/services/notifications.service.ts +++ b/apps/red-ui/src/app/services/notifications.service.ts @@ -4,7 +4,7 @@ import { TranslateService } from '@ngx-translate/core'; import { EMPTY, iif, Observable, of, timer } from 'rxjs'; import { Dossier, INotification, Notification, NotificationTypes } from '@red/domain'; import { map, switchMap, tap } from 'rxjs/operators'; -import { notificationsTranslations } from '../translations/notifications-translations'; +import { notificationsTranslations } from '@translations/notifications-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import dayjs from 'dayjs'; diff --git a/apps/red-ui/src/app/services/translate-chart.service.ts b/apps/red-ui/src/app/services/translate-chart.service.ts index 71fb222b9..516c8a95c 100644 --- a/apps/red-ui/src/app/services/translate-chart.service.ts +++ b/apps/red-ui/src/app/services/translate-chart.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { DonutChartConfig } from '@red/domain'; import { TranslateService } from '@ngx-translate/core'; -import { rolesTranslations } from '../translations/roles-translations'; -import { workflowFileStatusTranslations } from '../translations/file-status-translations'; +import { rolesTranslations } from '@translations/roles-translations'; +import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { DossierStatesMapService } from './entity-services/dossier-states-map.service'; @Injectable({ diff --git a/apps/red-ui/src/app/translations/account-translations.ts b/apps/red-ui/src/app/translations/account-translations.ts new file mode 100644 index 000000000..ecd67aa2b --- /dev/null +++ b/apps/red-ui/src/app/translations/account-translations.ts @@ -0,0 +1,6 @@ +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; + +export const accountTranslations: Record = { + notifications: _('notifications-screen.title'), + 'user-profile': _('user-profile-screen.title'), +}; diff --git a/apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts b/apps/red-ui/src/app/translations/admin-side-nav-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts rename to apps/red-ui/src/app/translations/admin-side-nav-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts b/apps/red-ui/src/app/translations/audit-categories-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts rename to apps/red-ui/src/app/translations/audit-categories-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts b/apps/red-ui/src/app/translations/default-colors-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts rename to apps/red-ui/src/app/translations/default-colors-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts b/apps/red-ui/src/app/translations/dossier-attribute-types-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts rename to apps/red-ui/src/app/translations/dossier-attribute-types-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/dossier-template-status-translations.ts b/apps/red-ui/src/app/translations/dossier-template-status-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/dossier-template-status-translations.ts rename to apps/red-ui/src/app/translations/dossier-template-status-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/file-attribute-encoding-types-translations.ts b/apps/red-ui/src/app/translations/file-attribute-encoding-types-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/file-attribute-encoding-types-translations.ts rename to apps/red-ui/src/app/translations/file-attribute-encoding-types-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts b/apps/red-ui/src/app/translations/file-attribute-types-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts rename to apps/red-ui/src/app/translations/file-attribute-types-translations.ts diff --git a/apps/red-ui/src/app/modules/dossier/translations/image-categories-translations.ts b/apps/red-ui/src/app/translations/image-categories-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/translations/image-categories-translations.ts rename to apps/red-ui/src/app/translations/image-categories-translations.ts diff --git a/apps/red-ui/src/app/modules/account/translations/languages-translations.ts b/apps/red-ui/src/app/translations/languages-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/account/translations/languages-translations.ts rename to apps/red-ui/src/app/translations/languages-translations.ts diff --git a/apps/red-ui/src/app/modules/account/translations/notifications-translations.ts b/apps/red-ui/src/app/translations/notifications-settings-translations.ts similarity index 91% rename from apps/red-ui/src/app/modules/account/translations/notifications-translations.ts rename to apps/red-ui/src/app/translations/notifications-settings-translations.ts index 872a7afa3..c6b8f6cb1 100644 --- a/apps/red-ui/src/app/modules/account/translations/notifications-translations.ts +++ b/apps/red-ui/src/app/translations/notifications-settings-translations.ts @@ -1,6 +1,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -export const notificationsTranslations: { [key: string]: string } = { +export const notificationsSettingsTranslations: Record = { daily: _('notifications-screen.schedule.instant'), daily_summary: _('notifications-screen.schedule.daily'), weekly_summary: _('notifications-screen.schedule.weekly'), @@ -24,6 +24,4 @@ export const notificationsTranslations: { [key: string]: string } = { dossier: _('notifications-screen.groups.dossier'), document: _('notifications-screen.groups.document'), other: _('notifications-screen.groups.other'), - notifications: _('notifications-screen.title'), - 'user-profile': _('user-profile-screen.title'), } as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/permissions-translations.ts b/apps/red-ui/src/app/translations/permissions-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/permissions-translations.ts rename to apps/red-ui/src/app/translations/permissions-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts b/apps/red-ui/src/app/translations/placeholders-descriptions-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts rename to apps/red-ui/src/app/translations/placeholders-descriptions-translations.ts diff --git a/apps/red-ui/src/app/modules/dossier/translations/workload-translations.ts b/apps/red-ui/src/app/translations/workload-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/translations/workload-translations.ts rename to apps/red-ui/src/app/translations/workload-translations.ts diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 9b8ce8cdb..228749f47 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1531,8 +1531,6 @@ "backend-version": "Backend-Version der Anwendung", "chart": { "cumulative": "Seiten insgesamt", - "legend": "Legende", - "licensed-total": "Insgesamt lizensiert", "pages-per-month": "Seiten pro Monat", "total-pages": "Gesamtzahl der Seiten" }, diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 2df6a0b00..73a430802 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1531,8 +1531,6 @@ "backend-version": "Backend Application Version", "chart": { "cumulative": "Cumulative Pages", - "legend": "Legend", - "licensed-total": "Licensed Total", "pages-per-month": "Pages per Month", "total-pages": "Total Pages" }, diff --git a/tsconfig.base.json b/tsconfig.base.json index 9901520b5..e2bd919d0 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -27,6 +27,7 @@ "@red/domain": ["libs/red-domain/src/index.ts"], "@services/*": ["apps/red-ui/src/app/services/*"], "@shared/*": ["apps/red-ui/src/app/modules/shared/*"], + "@translations/*": ["apps/red-ui/src/app/translations/*"], "@upload-download/*": ["apps/red-ui/src/app/modules/upload-download/*"], "@utils/*": ["apps/red-ui/src/app/utils/*"] }