diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java index 6abf20efb1..547743b9b9 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java @@ -309,6 +309,14 @@ void testGetEnum() { } + @Test + void testGetNullEnumNames() { + CheckBox checkbox = getCheckBoxUnderTest(PATH_CHECKBOX); + assertNull(checkbox.getEnumNames()); + CheckBox noEnumCheckbox = getCheckBoxUnderTest(PATH_CHECKBOX_NOENUM); + assertNull(noEnumCheckbox.getEnumNames()); + } + @Test void testGetNullEnum() { CheckBox noEnumCheckbox = getCheckBoxUnderTest(PATH_CHECKBOX_NOENUM); diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java index b016e1975c..0e62af6be2 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java @@ -310,7 +310,7 @@ void testGetType() { @Test void testGetEnumNames() { RadioButton radioButton = getRadioButtonUnderTest(PATH_RADIOBUTTON_CUSTOMIZED); - assertArrayEquals(new String[] { "Item 1", "Item 2" }, radioButton.getEnumNames()); + assertArrayEquals(new String[] { "

Item 1

", "

Item 2

" }, radioButton.getEnumNames()); } @Test diff --git a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json index 988424436a..b3e139b29d 100644 --- a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json +++ b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-customized.json @@ -16,8 +16,8 @@ }, "enforceEnum": true, "enumNames": [ - "Item 1", - "Item 2" + "

Item 1

", + "

Item 2

" ], "default": "0", "screenReaderText": "'custom text'", diff --git a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json index 078687521f..5855c62340 100644 --- a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json +++ b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton.json @@ -5,8 +5,8 @@ "type": "string", "enforceEnum": true, "enumNames": [ - "Item 1", - "Item 2" + "

Item 1

", + "

Item 2

" ], "label": { "value": "Radio Button" diff --git a/bundles/af-core/src/test/resources/form/radiobutton/test-content.json b/bundles/af-core/src/test/resources/form/radiobutton/test-content.json index d68b10d0c8..076198ea4c 100644 --- a/bundles/af-core/src/test/resources/form/radiobutton/test-content.json +++ b/bundles/af-core/src/test/resources/form/radiobutton/test-content.json @@ -8,13 +8,14 @@ "orientation": "vertical", "jcr:lastModifiedBy": "admin", "jcr:created": "Tue Sep 13 2022 15:17:35 GMT+0530", + "areOptionsRichText": true, "enum": [ "0", "1" ], "enumNames": [ - "Item 1", - "Item 2" + "

Item 1

", + "

Item 2

" ], "jcr:lastModified": "Tue Sep 13 2022 15:18:50 GMT+0530", "fieldType": "radio-group" @@ -37,14 +38,15 @@ "dorColspan": "4", "assistPriority": "custom", "jcr:created": "Tue Sep 13 2022 15:17:35 GMT+0530", + "areOptionsRichText": true, "enum": [ "0", "1" ], "type": "string", "enumNames": [ - "Item 1", - "Item 2" + "

Item 1

", + "

Item 2

" ], "visible": false, "readOnly": true, diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml index 04ee0e1ebd..0184cfce56 100755 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/de.xml @@ -129,6 +129,21 @@ jcr:primaryType="nt:folder" sling:key="guideContainer##wizard##jcr:title##299" sling:message="Zauberer"/> + <_x0039_6b6493f-b93e-4b2d-8b38-3633a3fe6286 + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##jcr:title##3329" + sling:message="<p><b>Tier auswählen</b></p>"/> + + <_x0037_c44f84b-8830-4270-ba63-8aa9de935572 + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##1" + sling:message="<p><u>Katze</u></p>"/> + + + <_x0031_33de41e-050d-4628-8b22-34b8b6dfa9fa + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##1" + sling:message="<p><u>Gato</u></p>"/> + + <_x0037_e28c9de-7712-4f7b-969d-0c90f92935af + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##0" + sling:message="<p><i>Chien</i></p>"/> + <_x0032_869e60b-f2eb-4e35-8d17-0673f7d870bc + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##1" + sling:message="<p><u>Chat</u></p>"/> diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml index 81f80c0637..9ab5e0f0b2 100755 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/hi.xml @@ -129,4 +129,19 @@ jcr:primaryType="nt:folder" sling:key="guideContainer##wizard##jcr:title##299" sling:message="जादूगर"/> + <_x0035_3786ca1-ac18-4151-8e13-db1ec440cb44 + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##jcr:title##3329" + sling:message="<p><b>पशु का चयन करें</b></p>"/> + + diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml index 88d4a55147..06a9c39887 100755 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/it.xml @@ -129,4 +129,19 @@ jcr:primaryType="nt:folder" sling:key="guideContainer##wizard##jcr:title##299" sling:message="mago"/> + <_x0038_fa19b1d-324d-453f-895f-60c86adb001c + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##jcr:title##3329" + sling:message="<p><b>Seleziona animale</b></p>"/> + <_x0030_ac73bc4-9c29-470f-9a99-a1c7f685a5b9 + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##0" + sling:message="<p><i>Cane</i></p>"/> + <_x0038_23d3ccb-d875-4a8d-9ff9-2a2859d7bdbd + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##1" + sling:message="<p><u>Gatto</u></p>"/> diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml index 5ade060385..10e9a6fce7 100755 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ja.xml @@ -129,4 +129,19 @@ jcr:primaryType="nt:folder" sling:key="guideContainer##wizard##jcr:title##299" sling:message="魔法使い"/> + <_x0030_9640d23-a956-457d-82fa-671bf0750fce + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##jcr:title##3329" + sling:message="<p><b>動物を選択</b></p>"/> + + <_x0038_a1f5c5f-4a24-4c48-a433-ce761870bbb1 + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##1" + sling:message="<p><u>猫</u></p>"/> diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml index 4650cd9bff..c68ecb7698 100755 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ko-kr.xml @@ -129,4 +129,19 @@ jcr:primaryType="nt:folder" sling:key="guideContainer##wizard##jcr:title##299" sling:message="마법사"/> + <_x0030_d52109d-2260-4962-b0a4-a589fceb42cd + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##jcr:title##3329" + sling:message="<p><b>동물 선택</b></p>"/> + <_x0030_ab74673-ed86-4d13-853e-86fbcb638588 + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##0" + sling:message="<p><i>개</i></p>"/> + diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml index 59242cfbb7..6f41b8ee49 100755 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/pt-br.xml @@ -129,4 +129,19 @@ jcr:primaryType="nt:folder" sling:key="guideContainer##wizard##jcr:title##299" sling:message="mago"/> + + <_x0031_b25629c-4816-4847-a9d1-63e421b47930 + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##0" + sling:message="<p><i>Cão</i></p>"/> + diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml index 855f673d2b..67653db508 100755 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/ru-ru.xml @@ -129,4 +129,19 @@ jcr:primaryType="nt:folder" sling:key="guideContainer##wizard##jcr:title##299" sling:message="колдун"/> + + + <_x0038_d8b15a1-c3c9-4816-abd6-7e69bc3c477a + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##1" + sling:message="<p><u>Кошка</u></p>"/> diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml index ff03638494..edd3fd1865 100755 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-cn.xml @@ -129,4 +129,19 @@ jcr:primaryType="nt:folder" sling:key="guideContainer##wizard##jcr:title##299" sling:message="巫师"/> + <_x0034_6fd8a2d-db44-4204-aca8-a4e8ecb178f7 + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##jcr:title##3329" + sling:message="<p><b>选择动物</b></p>"/> + + <_x0037_79cf790-b54b-429e-b5b2-ebed6ea0cbb7 + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##1" + sling:message="<p><u>猫</u></p>"/> diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml index fd7a76f7e6..d317556721 100755 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/_jcr_content/dictionary/zh-tw.xml @@ -129,4 +129,19 @@ jcr:primaryType="nt:folder" sling:key="guideContainer##wizard##jcr:title##299" sling:message="巫師"/> + <_x0036_0c96847-776f-406a-9de3-a669f70ca113 + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##jcr:title##3329" + sling:message="<p><b>選擇動物</b></p>"/> + <_x0037_75e6e65-0828-4020-95f6-355249b69aaf + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##0" + sling:message="<p><i>狗</i></p>"/> + <_x0030_a911e93-4cd9-416d-ac7a-1f348014bbed + jcr:mixinTypes="[sling:Message]" + jcr:primaryType="nt:folder" + sling:key="guideContainer##checkboxgroup7##enumNames##7570##1" + sling:message="<p><u>貓</u></p>"/> diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml index e47fefc6db..228fda67fc 100755 --- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml +++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml @@ -48,7 +48,7 @@ enum="[0,1]" enumNames="[Item 1, Item 2]" fieldType="checkbox-group" - name="checkboxgroup1678442866069" + name="checkboxgroup1" type="number[]"/> + diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml index 30e1d78040..9dc2b02920 100755 --- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml +++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml @@ -153,6 +153,28 @@ textIsRich="[true,true]" type="number[]" visible="{Boolean}true"/> + diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml index 735577ac08..fc040d93fc 100644 --- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml +++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml @@ -118,7 +118,7 @@ sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink" enabled="{Boolean}true" enum="http://localhost" - enumNames="[label for the link]" + enumNames="label for the link" fieldType="checkbox-group" hideTitle="false" name="link1695211072051" diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html index 07f79c829e..823bd9bd9b 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/label.html @@ -1,4 +1,4 @@ -