diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html index 3bf02c4abd5..3dab2d214a7 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html @@ -14,7 +14,7 @@ [(ngModel)]="initialYear" [value]="year" [invalid]="showErrorMessages" - [placeholder]='yearPlaceholder' + [placeholder]="'form.date-picker.placeholder.year' | translate" (blur)="onBlur($event)" (change)="onChange($event)" (focus)="onFocus($event)" @@ -29,7 +29,7 @@ [size]="6" [(ngModel)]="initialMonth" [value]="month" - [placeholder]="monthPlaceholder" + [placeholder]="'form.date-picker.placeholder.month' | translate" [disabled]="!year || model.disabled" (blur)="onBlur($event)" (change)="onChange($event)" @@ -45,7 +45,7 @@ [size]="2" [(ngModel)]="initialDay" [value]="day" - [placeholder]="dayPlaceholder" + [placeholder]="'form.date-picker.placeholder.day' | translate" [disabled]="!month || model.disabled" (blur)="onBlur($event)" (change)="onChange($event)" diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts index 2b30c439b8a..50325e00581 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts @@ -14,6 +14,7 @@ import { mockDynamicFormValidationService } from '../../../../../testing/dynamic-form-mock-services'; import { By } from '@angular/platform-browser'; +import { TranslateModule } from '@ngx-translate/core'; export const DATE_TEST_GROUP = new UntypedFormGroup({ @@ -51,7 +52,8 @@ describe('DsDatePickerComponent test suite', () => { TestBed.configureTestingModule({ imports: [ - NgbModule + NgbModule, + TranslateModule.forRoot(), ], declarations: [ DsDatePickerComponent, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts index 404e8514933..a3e93a6bb4b 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts @@ -9,6 +9,7 @@ import { } from '@ng-dynamic-forms/core'; import { DOCUMENT } from '@angular/common'; import isEqual from 'lodash/isEqual'; +import { TranslateService } from '@ngx-translate/core'; export type DatePickerFieldType = '_year' | '_month' | '_day'; @@ -48,10 +49,6 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement minDay = 1; maxDay = 31; - yearPlaceholder = 'year'; - monthPlaceholder = 'month'; - dayPlaceholder = 'day'; - disabledMonth = true; disabledDay = true; @@ -59,6 +56,7 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement constructor(protected layoutService: DynamicFormLayoutService, protected validationService: DynamicFormValidationService, + protected translateService: TranslateService, private renderer: Renderer2, @Inject(DOCUMENT) private _document: Document ) { diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5 index 82420d691b9..5e48b3d7e89 100644 --- a/src/assets/i18n/de.json5 +++ b/src/assets/i18n/de.json5 @@ -5553,4 +5553,14 @@ // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.", + + + // "form.date-picker.placeholder.year": "Year", + "form.date-picker.placeholder.year": "Jahr", + + // "form.date-picker.placeholder.month": "Month", + "form.date-picker.placeholder.month": "Monat", + + // "form.date-picker.placeholder.day": "Day", + "form.date-picker.placeholder.day": "Tag", } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 99ce1962544..c1660c1f0c7 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1808,6 +1808,12 @@ "form.number-picker.increment": "Increment {{field}}", + "form.date-picker.placeholder.year": "Year", + + "form.date-picker.placeholder.month": "Month", + + "form.date-picker.placeholder.day": "Day", + "grant-deny-request-copy.deny": "Don't send copy", "grant-deny-request-copy.email.back": "Back",