diff --git a/src/components/forms/Label.js b/src/components/forms/Label.js index d274d0414..34a0e8c88 100644 --- a/src/components/forms/Label.js +++ b/src/components/forms/Label.js @@ -19,7 +19,7 @@ export const LabelContent = ({id, disabled = false, isRequired = false, type, ch > children, diff --git a/src/formio/templates/checkbox.ejs b/src/formio/templates/checkbox.ejs index 1429c9015..8e85ea84f 100644 --- a/src/formio/templates/checkbox.ejs +++ b/src/formio/templates/checkbox.ejs @@ -4,7 +4,7 @@ for="{{ctx.instance.id}}-{{ctx.component.key}}" class="utrecht-form-label utrecht-form-label--checkbox {% if (ctx.disabled) { %}utrecht-form-label--disabled{% } %} {{ctx.input.labelClass}} {% if (ctx.component.validate.required && ctx.requiredFieldsWithAsterisk) { %}utrecht-form-label--openforms-required{% } %}" > - {{ctx.input.label}}{% if (!ctx.component.validate.required && !ctx.requiredFieldsWithAsterisk) { %} {{ ctx.t('(optional)') }} {% } %} + {{ctx.input.label}}{% if (!ctx.component.validate.required && !ctx.requiredFieldsWithAsterisk) { %} {{ ctx.t('(not required)') }} {% } %} {% if (ctx.component.tooltip) { %} {% } %} diff --git a/src/formio/templates/label.ejs b/src/formio/templates/label.ejs index 2e06ddb42..024679b8c 100644 --- a/src/formio/templates/label.ejs +++ b/src/formio/templates/label.ejs @@ -8,7 +8,7 @@ > {{ ctx.t(ctx.component.label, { _userInput: true }) }} {% if (!ctx.component.validate.required && !ctx.requiredFieldsWithAsterisk) { %} - {{ ctx.t('(optional)') }} + {{ ctx.t('(not required)') }} {% } %} {% if (ctx.component.tooltip) { %} diff --git a/src/i18n/compiled/en.json b/src/i18n/compiled/en.json index d2849121f..9d86e3057 100644 --- a/src/i18n/compiled/en.json +++ b/src/i18n/compiled/en.json @@ -1687,38 +1687,6 @@ "value": "Log in to co-sign the form" } ], - "qf2UCG": [ - { - "options": { - "other": { - "value": [ - { - "children": [ - ], - "type": 8, - "value": "label" - }, - { - "type": 0, - "value": " (optional)" - } - ] - }, - "true": { - "value": [ - { - "children": [ - ], - "type": 8, - "value": "label" - } - ] - } - }, - "type": 5, - "value": "withAsterisk" - } - ], "r1L6Zj": [ { "type": 0, @@ -1903,6 +1871,38 @@ "value": "Co-sign confirmation" } ], + "yXbqL6": [ + { + "options": { + "other": { + "value": [ + { + "children": [ + ], + "type": 8, + "value": "label" + }, + { + "type": 0, + "value": " (not required)" + } + ] + }, + "true": { + "value": [ + { + "children": [ + ], + "type": 8, + "value": "label" + } + ] + } + }, + "type": 5, + "value": "withAsterisk" + } + ], "zQWnFh": [ { "type": 0, diff --git a/src/i18n/compiled/nl.json b/src/i18n/compiled/nl.json index d64910fca..e8882bb47 100644 --- a/src/i18n/compiled/nl.json +++ b/src/i18n/compiled/nl.json @@ -1691,38 +1691,6 @@ "value": "Log in om het formulier mede te ondertekenen" } ], - "qf2UCG": [ - { - "options": { - "other": { - "value": [ - { - "children": [ - ], - "type": 8, - "value": "label" - }, - { - "type": 0, - "value": " (optioneel)" - } - ] - }, - "true": { - "value": [ - { - "children": [ - ], - "type": 8, - "value": "label" - } - ] - } - }, - "type": 5, - "value": "withAsterisk" - } - ], "r1L6Zj": [ { "type": 0, @@ -1907,6 +1875,38 @@ "value": "Bevestiging mede-ondertekening" } ], + "yXbqL6": [ + { + "options": { + "other": { + "value": [ + { + "children": [ + ], + "type": 8, + "value": "label" + }, + { + "type": 0, + "value": " (niet verplicht)" + } + ] + }, + "true": { + "value": [ + { + "children": [ + ], + "type": 8, + "value": "label" + } + ] + } + }, + "type": 5, + "value": "withAsterisk" + } + ], "zQWnFh": [ { "type": 0, diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json index 05f1d9c15..e7fa649d6 100644 --- a/src/i18n/messages/en.json +++ b/src/i18n/messages/en.json @@ -764,11 +764,6 @@ "description": "Log in to co-sign the form title", "originalDefault": "Log in to co-sign the form" }, - "qf2UCG": { - "defaultMessage": "{withAsterisk, select, true {} other { (optional)}}", - "description": "Form field label, field possibly optional", - "originalDefault": "{withAsterisk, select, true {} other { (optional)}}" - }, "r1L6Zj": { "defaultMessage": "Suspending the form failed, please try again later", "description": "Modal suspending form failed message", @@ -849,6 +844,11 @@ "description": "On succesful completion title", "originalDefault": "Co-sign confirmation" }, + "yXbqL6": { + "defaultMessage": "{withAsterisk, select, true {} other { (not required)}}", + "description": "Form field label, field possibly optional", + "originalDefault": "{withAsterisk, select, true {} other { (not required)}}" + }, "zQWnFh": { "defaultMessage": "Are you sure that you want to logout and not co-sign the current form submission?", "description": "log out confirmation prompt on co-sign page", diff --git a/src/i18n/messages/nl.json b/src/i18n/messages/nl.json index 7fbe46c98..c503ffa7c 100644 --- a/src/i18n/messages/nl.json +++ b/src/i18n/messages/nl.json @@ -774,11 +774,6 @@ "description": "Log in to co-sign the form title", "originalDefault": "Log in to co-sign the form" }, - "qf2UCG": { - "defaultMessage": "{withAsterisk, select, true {} other { (optioneel)}}", - "description": "Form field label, field possibly optional", - "originalDefault": "{withAsterisk, select, true {} other { (optional)}}" - }, "r1L6Zj": { "defaultMessage": "Het pauzeren van het formulier is mislukt. Probeer het later opnieuw.", "description": "Modal suspending form failed message", @@ -859,6 +854,11 @@ "description": "On succesful completion title", "originalDefault": "Co-sign confirmation" }, + "yXbqL6": { + "defaultMessage": "{withAsterisk, select, true {} other { (niet verplicht)}}", + "description": "Form field label, field possibly optional", + "originalDefault": "{withAsterisk, select, true {} other { (not required)}}" + }, "zQWnFh": { "defaultMessage": "Bent u zeker dat u wilt uitloggen en hiermee de inzending niet mede-ondertekent?", "description": "log out confirmation prompt on co-sign page",