From 0aaf3131fa4ef3b56b4f34715c417986e906cbab Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Wed, 17 Jan 2024 11:49:00 -0600 Subject: [PATCH] Move increment/decrement to i18n. Update to use "name". --- .../shared/form/number-picker/number-picker.component.html | 4 ++-- .../form/number-picker/number-picker.component.spec.ts | 4 +++- src/app/shared/form/number-picker/number-picker.component.ts | 5 ++++- src/assets/i18n/en.json5 | 4 ++++ 4 files changed, 13 insertions(+), 4 deletions(-) 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 d4cf9e23f4..12e29fa70e 100644 --- a/src/app/shared/form/number-picker/number-picker.component.html +++ b/src/app/shared/form/number-picker/number-picker.component.html @@ -6,7 +6,7 @@ [disabled]="disabled" (click)="toggleUp()"> - Increment {{placeholder}} + {{'form.number-picker.increment' | translate: {field: name} }} - Decrement {{placeholder}} + {{'form.number-picker.decrement' | translate: {field: name} }} diff --git a/src/app/shared/form/number-picker/number-picker.component.spec.ts b/src/app/shared/form/number-picker/number-picker.component.spec.ts index bf33a6bdd0..b6d623d70b 100644 --- a/src/app/shared/form/number-picker/number-picker.component.spec.ts +++ b/src/app/shared/form/number-picker/number-picker.component.spec.ts @@ -7,6 +7,7 @@ import { By } from '@angular/platform-browser'; import { NumberPickerComponent } from './number-picker.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { createTestComponent } from '../../testing/utils.test'; +import { TranslateModule } from '@ngx-translate/core'; describe('NumberPickerComponent test suite', () => { @@ -23,7 +24,8 @@ describe('NumberPickerComponent test suite', () => { imports: [ FormsModule, ReactiveFormsModule, - NgbModule + NgbModule, + TranslateModule.forRoot() ], declarations: [ NumberPickerComponent, diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts index 40562dd61c..8f2de5ee54 100644 --- a/src/app/shared/form/number-picker/number-picker.component.ts +++ b/src/app/shared/form/number-picker/number-picker.component.ts @@ -1,5 +1,6 @@ import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, SimpleChanges, } from '@angular/core'; import { ControlValueAccessor, UntypedFormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { TranslateService } from '@ngx-translate/core'; import { isEmpty } from '../../empty.util'; @Component({ @@ -31,7 +32,9 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor { startValue: number; - constructor(private fb: UntypedFormBuilder, private cd: ChangeDetectorRef) { + constructor(private fb: UntypedFormBuilder, + private cd: ChangeDetectorRef, + private translate: TranslateService) { } ngOnInit() { diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index deea56b1d2..d7c50b1a60 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1770,6 +1770,10 @@ "form.repeatable.sort.tip": "Drop the item in the new position", + "form.number-picker.decrement": "Decrement {{field}}", + + "form.number-picker.increment": "Increment {{field}}", + "grant-deny-request-copy.deny": "Don't send copy", "grant-deny-request-copy.email.back": "Back",