From 6e5d4b9767c7d02255f70e94c5294204b7b0db2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kan=C3=A1sz-Nagy=20Zolt=C3=A1n?= Date: Mon, 11 May 2026 09:43:57 +0200 Subject: [PATCH 1/3] QREPO-403 fixing i18n translation problem for date picker labels --- .../models/date-picker/date-picker.component.html | 6 +++--- .../form/number-picker/number-picker.component.html | 8 ++++---- src/assets/i18n/hu.json5 | 9 +++------ 3 files changed, 10 insertions(+), 13 deletions(-) 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 3e6e05c7f74..84c7454ba12 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 @@ -19,7 +19,7 @@ [(ngModel)]="initialYear" [value]="year" [invalid]="showErrorMessages" - [placeholder]="'form.date-picker.placeholder.year' | translate" + [placeholder]="'Year'" [widthClass]="'four-digits'" (blur)="onBlur($event)" (change)="onChange($event)" @@ -35,7 +35,7 @@ [size]="2" [(ngModel)]="initialMonth" [value]="month" - [placeholder]="'form.date-picker.placeholder.month' | translate" + [placeholder]="'Month'" [disabled]="!year || model.disabled" [widthClass]="'two-digits'" (blur)="onBlur($event)" @@ -52,7 +52,7 @@ [size]="2" [(ngModel)]="initialDay" [value]="day" - [placeholder]="'form.date-picker.placeholder.day' | translate" + [placeholder]="'Day'" [disabled]="!month || model.disabled" [widthClass]="'two-digits'" (blur)="onBlur($event)" diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html index e704e278c6a..b36dbca42f8 100644 --- a/src/app/shared/form/number-picker/number-picker.component.html +++ b/src/app/shared/form/number-picker/number-picker.component.html @@ -7,8 +7,8 @@ tabindex="0" [dsBtnDisabled]="disabled" (click)="toggleUp()" - title="{{'form.number-picker.increment' | translate: {field: placeholder} }}" - [attr.aria-label]="'form.number-picker.increment' | translate: {field: placeholder}"> + title="{{'form.number-picker.increment' | translate: {field: ('form.number-picker.label.' + placeholder | translate)} }}" + [attr.aria-label]="'form.number-picker.increment' | translate: {field: ('form.number-picker.label.' + placeholder | translate)}"> {{'form.number-picker.increment' | translate: {field: name} }} @@ -36,8 +36,8 @@ tabindex="0" [dsBtnDisabled]="disabled" (click)="toggleDown()" - title="{{'form.number-picker.decrement' | translate: {field: placeholder} }}" - [attr.aria-label]="'form.number-picker.decrement' | translate: {field: placeholder}"> + title="{{'form.number-picker.decrement' | translate: {field: ('form.number-picker.label.' + placeholder | translate)} }}" + [attr.aria-label]="'form.number-picker.decrement' | translate: {field: ('form.number-picker.label.' + placeholder | translate)}"> {{'form.number-picker.decrement' | translate: {field: name} }} diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5 index b3a3b583294..41e88d06524 100644 --- a/src/assets/i18n/hu.json5 +++ b/src/assets/i18n/hu.json5 @@ -3429,16 +3429,13 @@ "form.number-picker.increment": "{{field}} növelése", // "form.number-picker.label.Year": "Year", - // TODO New key - Add a translation - "form.number-picker.label.Year": "Year", + "form.number-picker.label.Year": "Év", // "form.number-picker.label.Month": "Month", - // TODO New key - Add a translation - "form.number-picker.label.Month": "Month", + "form.number-picker.label.Month": "Hónap", // "form.number-picker.label.Day": "Day", - // TODO New key - Add a translation - "form.number-picker.label.Day": "Day", + "form.number-picker.label.Day": "Nap", // "form.repeatable.sort.tip": "Drop the item in the new position", "form.repeatable.sort.tip": "Húzza az elemet az új pozícióba.", From feedb4f8c0ef80632cd64197cdcf40a43ffe0c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kan=C3=A1sz-Nagy=20Zolt=C3=A1n?= Date: Wed, 13 May 2026 09:21:44 +0200 Subject: [PATCH 2/3] QREPO-403 updating code using the help given in the PR comment --- .../models/date-picker/date-picker.component.html | 6 +++--- .../form/number-picker/number-picker.component.html | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) 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 84c7454ba12..c789609c361 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 @@ -19,7 +19,7 @@ [(ngModel)]="initialYear" [value]="year" [invalid]="showErrorMessages" - [placeholder]="'Year'" + [placeholder]="'form.date-picker.placeholder.year'" [widthClass]="'four-digits'" (blur)="onBlur($event)" (change)="onChange($event)" @@ -35,7 +35,7 @@ [size]="2" [(ngModel)]="initialMonth" [value]="month" - [placeholder]="'Month'" + [placeholder]="'form.date-picker.placeholder.month'" [disabled]="!year || model.disabled" [widthClass]="'two-digits'" (blur)="onBlur($event)" @@ -52,7 +52,7 @@ [size]="2" [(ngModel)]="initialDay" [value]="day" - [placeholder]="'Day'" + [placeholder]="'form.date-picker.placeholder.day'" [disabled]="!month || model.disabled" [widthClass]="'two-digits'" (blur)="onBlur($event)" diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html index b36dbca42f8..4fef1979f9b 100644 --- a/src/app/shared/form/number-picker/number-picker.component.html +++ b/src/app/shared/form/number-picker/number-picker.component.html @@ -1,5 +1,5 @@
- +
@@ -26,7 +26,7 @@ [readonly]="disabled" [disabled]="disabled" [ngClass]="{'is-invalid': invalid}" - title="{{'form.number-picker.label.' + placeholder | translate}}" + title="{{placeholder | translate}}" [attr.aria-labelledby]="id + ' increment-' + id + ' decrement-' + id" > @@ -36,8 +36,8 @@ tabindex="0" [dsBtnDisabled]="disabled" (click)="toggleDown()" - title="{{'form.number-picker.decrement' | translate: {field: ('form.number-picker.label.' + placeholder | translate)} }}" - [attr.aria-label]="'form.number-picker.decrement' | translate: {field: ('form.number-picker.label.' + placeholder | translate)}"> + title="{{'form.number-picker.decrement' | translate: {field: (placeholder | translate)} }}" + [attr.aria-label]="'form.number-picker.decrement' | translate: {field: (placeholder | translate)}"> {{'form.number-picker.decrement' | translate: {field: name} }} From 8fbaf66680ec2fc2c16688e2c8bdebed8660f215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kan=C3=A1sz-Nagy=20Zolt=C3=A1n?= Date: Wed, 13 May 2026 09:23:58 +0200 Subject: [PATCH 3/3] QREPO-403 removing unnecessary keys from hu.json5 --- src/assets/i18n/hu.json5 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5 index 41e88d06524..3bcf04bba50 100644 --- a/src/assets/i18n/hu.json5 +++ b/src/assets/i18n/hu.json5 @@ -3428,15 +3428,6 @@ // "form.number-picker.increment": "Increment {{field}}", "form.number-picker.increment": "{{field}} növelése", - // "form.number-picker.label.Year": "Year", - "form.number-picker.label.Year": "Év", - - // "form.number-picker.label.Month": "Month", - "form.number-picker.label.Month": "Hónap", - - // "form.number-picker.label.Day": "Day", - "form.number-picker.label.Day": "Nap", - // "form.repeatable.sort.tip": "Drop the item in the new position", "form.repeatable.sort.tip": "Húzza az elemet az új pozícióba.",