diff --git a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.html b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.html index d3b76e294..acd38e4a6 100644 --- a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.html +++ b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.html @@ -26,7 +26,7 @@ - {{ 'top-bar.navigation-items.my-account.children.language.' + language | translate }} + {{ translations[language] | translate }} diff --git a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts index 359cf01de..79a60257a 100644 --- a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts +++ b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts @@ -7,6 +7,7 @@ import { TranslateService } from '@ngx-translate/core'; import { UserControllerService } from '@redaction/red-ui-http'; import { AppConfigKey, AppConfigService } from '@app-config/app-config.service'; import { DomSanitizer } from '@angular/platform-browser'; +import { languagesTranslations } from '../../translations/languages-translations'; @Component({ selector: 'redaction-user-profile-screen', @@ -17,6 +18,7 @@ export class UserProfileScreenComponent implements OnInit { viewReady = false; formGroup: FormGroup; changePasswordUrl: any; + translations = languagesTranslations; private _profileModel: ProfileModel; 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 b21f61273..5a35385c2 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 @@ -8,7 +8,7 @@ import { HttpErrorResponse } from '@angular/common/http'; import { Toaster } from '@services/toaster.service'; import { AutoUnsubscribeComponent } from '@shared/base/auto-unsubscribe.component'; 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'; @Component({ selector: 'redaction-add-edit-dossier-attribute-dialog', diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html index a27a36051..0349c10f9 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html @@ -32,7 +32,7 @@ - {{ 'file-attribute-types.' + type | translate }} + {{ translations[type] | translate }} 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 c24f4576f..692d3961e 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 @@ -3,6 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AppStateService } from '@state/app-state.service'; import { FileAttributeConfig } from '@redaction/red-ui-http'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { fileAttributeTypesTranslations } from '../../translations/file-attribute-types-translations'; @Component({ selector: 'redaction-add-edit-file-attribute-dialog', @@ -14,6 +15,7 @@ export class AddEditFileAttributeDialogComponent { fileAttribute: FileAttributeConfig; dossierTemplateId: string; readonly typeOptions = [FileAttributeConfig.TypeEnum.TEXT, FileAttributeConfig.TypeEnum.NUMBER, FileAttributeConfig.TypeEnum.DATE]; + translations = fileAttributeTypesTranslations; constructor( private readonly _appStateService: AppStateService, 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 25b058ef0..864ffbb23 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 @@ -5,7 +5,7 @@ import { Toaster } from '@services/toaster.service'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; import { DefaultColorType } from '@models/default-color-key.model'; -import defaultColorsTranslations from '../../translations/default-colors-translations'; +import { defaultColorsTranslations } from '../../translations/default-colors-translations'; @Component({ selector: 'redaction-edit-color-dialog', diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html index f03412ce2..8862210d7 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html @@ -47,7 +47,7 @@ @@ -134,7 +134,7 @@ - {{ 'file-attribute-types.' + type | translate }} + {{ translations[type] | translate }} 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 5068b98b5..953f2e87e 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 @@ -6,6 +6,7 @@ import { SearchService } from '@shared/services/search.service'; import { ScreenStateService } from '@shared/services/screen-state.service'; import { SortingService } from '@services/sorting.service'; import { BaseListingComponent } from '@shared/base/base-listing.component'; +import { fileAttributeTypesTranslations } from '../../../translations/file-attribute-types-translations'; @Component({ selector: 'redaction-active-fields-listing', @@ -18,6 +19,7 @@ export class ActiveFieldsListingComponent extends BaseListingComponent im @Output() entitiesChange = new EventEmitter(); @Output() setHoveredColumn = new EventEmitter(); @Output() toggleFieldActive = new EventEmitter(); + translations = fileAttributeTypesTranslations; readonly typeOptions = [FileAttributeConfig.TypeEnum.TEXT, FileAttributeConfig.TypeEnum.NUMBER, FileAttributeConfig.TypeEnum.DATE]; protected readonly _primaryKey = 'id'; 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 eea6367a4..5aaca396d 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 @@ -6,7 +6,7 @@ import { Moment } from 'moment'; import { applyIntervalConstraints } from '@utils/date-inputs-utils'; import { LoadingService } from '@services/loading.service'; import { AutoUnsubscribeComponent } from '@shared/base/auto-unsubscribe.component'; -import auditCategoriesTranslations from '../../translations/audit-categories-translations'; +import { auditCategoriesTranslations } from '../../translations/audit-categories-translations'; const PAGE_SIZE = 50; 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 6cceafce2..5dae2be05 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 @@ -11,7 +11,7 @@ import { ScreenStateService } from '@shared/services/screen-state.service'; import { BaseListingComponent } from '@shared/base/base-listing.component'; import { DefaultColorType } from '@models/default-color-key.model'; import { SortingService } from '@services/sorting.service'; -import defaultColorsTranslations from '../../translations/default-colors-translations'; +import { defaultColorsTranslations } from '../../translations/default-colors-translations'; @Component({ templateUrl: './default-colors-screen.component.html', 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 17ebdf541..3feeccebc 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 @@ -11,7 +11,7 @@ import { SearchService } from '@shared/services/search.service'; import { ScreenStateService } from '@shared/services/screen-state.service'; import { PermissionsService } from '@services/permissions.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'; @Component({ templateUrl: './dossier-attributes-listing-screen.component.html', diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html index afdfafadc..1edc6b311 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html @@ -130,7 +130,7 @@ {{ attribute.label }} -
+
implements OnInit, OnDestroy { + translations = fileAttributeTypesTranslations; protected readonly _primaryKey = 'label'; - private _existingConfiguration: FileAttributesConfig; @ViewChild('fileInput') private _fileInput: ElementRef; diff --git a/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts b/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts index 571ebbeae..82a25e8a7 100644 --- a/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts @@ -1,6 +1,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -const auditCategoriesTranslations: { [key: string]: string } = { +export const auditCategoriesTranslations: { [key: string]: string } = { allCategories: _('audit-screen.categories.all-categories'), LICENSE: _('audit-screen.categories.license'), DOWNLOAD: _('audit-screen.categories.download'), @@ -14,5 +14,3 @@ const auditCategoriesTranslations: { [key: string]: string } = { AUDIT: _('audit-screen.categories.audit'), DOSSIER_TEMPLATE: _('audit-screen.categories.dossier-template') }; - -export default auditCategoriesTranslations; diff --git a/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts b/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts index b3c9e7a63..f14212fcb 100644 --- a/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts @@ -1,7 +1,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DefaultColorType } from '@models/default-color-key.model'; -const defaultColorsTranslations: { [key in DefaultColorType]: string } = { +export const defaultColorsTranslations: { [key in DefaultColorType]: string } = { analysisColor: _('default-colors-screen.types.analysisColor'), defaultColor: _('default-colors-screen.types.defaultColor'), dictionaryRequestColor: _('default-colors-screen.types.dictionaryRequestColor'), @@ -12,5 +12,3 @@ const defaultColorsTranslations: { [key in DefaultColorType]: string } = { requestRemove: _('default-colors-screen.types.requestRemove'), updatedColor: _('default-colors-screen.types.updatedColor') }; - -export default defaultColorsTranslations; diff --git a/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts b/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts index 8a3bf1c45..bb325e3c9 100644 --- a/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts @@ -1,11 +1,9 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierAttributeConfig } from '@redaction/red-ui-http'; -const dossierAttributeTypesTranslations: { [key in DossierAttributeConfig.TypeEnum]: string } = { +export const dossierAttributeTypesTranslations: { [key in DossierAttributeConfig.TypeEnum]: string } = { TEXT: _('dossier-attribute-types.text'), NUMBER: _('dossier-attribute-types.number'), DATE: _('dossier-attribute-types.date'), IMAGE: _('dossier-attribute-types.image') }; - -export default dossierAttributeTypesTranslations; diff --git a/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts b/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts new file mode 100644 index 000000000..5262ab6c9 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts @@ -0,0 +1,8 @@ +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { FileAttributeConfig } from '@redaction/red-ui-http'; + +export const fileAttributeTypesTranslations: { [key in FileAttributeConfig.TypeEnum]: string } = { + TEXT: _('file-attribute-types.text'), + NUMBER: _('file-attribute-types.number'), + DATE: _('file-attribute-types.date') +}; diff --git a/apps/red-ui/src/app/translations/languages-translations.ts b/apps/red-ui/src/app/translations/languages-translations.ts new file mode 100644 index 000000000..412f98128 --- /dev/null +++ b/apps/red-ui/src/app/translations/languages-translations.ts @@ -0,0 +1,6 @@ +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; + +export const languagesTranslations: { [key: string]: string } = { + en: _('top-bar.navigation-items.my-account.children.language.en'), + de: _('top-bar.navigation-items.my-account.children.language.de') +}; diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 76a053f06..c9f49e3cd 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -842,9 +842,9 @@ }, "efsa": "EFSA Approval", "file-attribute-types": { - "DATE": "Date", - "NUMBER": "Number", - "TEXT": "Free Text" + "date": "Date", + "number": "Number", + "text": "Free Text" }, "file-attributes": "File Attributes", "file-attributes-csv-import": { diff --git a/apps/red-ui/src/assets/i18n/te.json b/apps/red-ui/src/assets/i18n/te.json index 5ceeecd92..0b65dfbee 100644 --- a/apps/red-ui/src/assets/i18n/te.json +++ b/apps/red-ui/src/assets/i18n/te.json @@ -630,7 +630,9 @@ } }, "file-attribute-types": { - "": "" + "date": "", + "number": "", + "text": "" }, "file-attributes-csv-import": { "action": { @@ -984,6 +986,8 @@ "my-account": { "children": { "language": { + "de": "", + "en": "", "label": "" }, "logout": ""