From 0c95ace9551e0edc7e5a6887ef51fc7828d3dfb4 Mon Sep 17 00:00:00 2001 From: Spoffy Date: Thu, 9 May 2024 20:28:08 +0100 Subject: [PATCH] translates SELECT_PLACEHOLDER --- app/client/components/FormRenderer.ts | 14 +++++++------- app/client/components/Forms/Field.ts | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/client/components/FormRenderer.ts b/app/client/components/FormRenderer.ts index 685c22df..632834aa 100644 --- a/app/client/components/FormRenderer.ts +++ b/app/client/components/FormRenderer.ts @@ -359,7 +359,7 @@ class DateTimeRenderer extends TextRenderer { protected inputType = 'datetime-local'; } -export const SELECT_PLACEHOLDER = 'Select...'; +export const selectPlaceholder = () => t('Select...'); class ChoiceRenderer extends BaseFieldRenderer { protected value: Observable; @@ -420,7 +420,7 @@ class ChoiceRenderer extends BaseFieldRenderer { this._selectElement = css.select( {name: this.name(), required: this.field.options.formRequired}, dom.on('input', (_e, elem) => this.value.set(elem.value)), - dom('option', {value: ''}, SELECT_PLACEHOLDER), + dom('option', {value: ''}, selectPlaceholder()), this._choices.map((choice) => dom('option', {value: choice}, dom.prop('selected', use => use(this.value) === choice), @@ -437,11 +437,11 @@ class ChoiceRenderer extends BaseFieldRenderer { ), dom.maybe(use => !use(isXSmallScreenObs()), () => css.searchSelect( - dom('div', dom.text(use => use(this.value) || SELECT_PLACEHOLDER)), + dom('div', dom.text(use => use(this.value) || selectPlaceholder())), dropdownWithSearch({ action: (value) => this.value.set(value), options: () => [ - {label: SELECT_PLACEHOLDER, value: '', placeholder: true}, + {label: selectPlaceholder(), value: '', placeholder: true}, ...this._choices.map((choice) => ({ label: choice, value: choice, @@ -760,7 +760,7 @@ class RefRenderer extends BaseFieldRenderer { dom.on('input', (_e, elem) => this.value.set(elem.value)), dom('option', {value: ''}, - SELECT_PLACEHOLDER, + selectPlaceholder(), dom.prop('selected', use => use(this.value) === ''), ), this._choices.map((choice) => dom('option', @@ -781,12 +781,12 @@ class RefRenderer extends BaseFieldRenderer { css.searchSelect( dom('div', dom.text(use => { const choice = this._choices.find((c) => String(c[0]) === use(this.value)); - return String(choice?.[1] || SELECT_PLACEHOLDER); + return String(choice?.[1] || selectPlaceholder()); })), dropdownWithSearch({ action: (value) => this.value.set(value), options: () => [ - {label: SELECT_PLACEHOLDER, value: '', placeholder: true}, + {label: selectPlaceholder(), value: '', placeholder: true}, ...this._choices.map((choice) => ({ label: String(choice[1]), value: String(choice[0]), diff --git a/app/client/components/Forms/Field.ts b/app/client/components/Forms/Field.ts index 5d1864c3..f8700d47 100644 --- a/app/client/components/Forms/Field.ts +++ b/app/client/components/Forms/Field.ts @@ -1,4 +1,4 @@ -import {FormLayoutNode, SELECT_PLACEHOLDER} from 'app/client/components/FormRenderer'; +import {FormLayoutNode, selectPlaceholder} from 'app/client/components/FormRenderer'; import {buildEditor} from 'app/client/components/Forms/Editor'; import {FormView} from 'app/client/components/Forms/FormView'; import {BoxModel, ignoreClick} from 'app/client/components/Forms/Model'; @@ -406,7 +406,7 @@ class ChoiceModel extends Question { ignoreClick, dom.prop('name', use => use(use(this.field).colId)), dom('option', - SELECT_PLACEHOLDER, + selectPlaceholder(), {value: ''}, ), dom.forEach(this.choices, (choice) => dom('option', @@ -616,7 +616,7 @@ class RefModel extends RefListModel { ignoreClick, dom.prop('name', this.model.colId), dom('option', - SELECT_PLACEHOLDER, + selectPlaceholder(), {value: ''}, ), dom.forEach(this.options, ({label, value}) => dom('option',