From 6d719c33f71bf4b4a310c2988bdb3733c6786383 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Fri, 16 Aug 2024 16:27:06 +0530
Subject: [PATCH 1/7] Move label calculation to where it's used

---
 src/main/java/org/javarosa/xform/parse/XFormParser.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/javarosa/xform/parse/XFormParser.java b/src/main/java/org/javarosa/xform/parse/XFormParser.java
index c8b5a3bdbb..083c5e780e 100755
--- a/src/main/java/org/javarosa/xform/parse/XFormParser.java
+++ b/src/main/java/org/javarosa/xform/parse/XFormParser.java
@@ -1082,8 +1082,6 @@ private void parseGroupLabel(GroupDef g, Element e) {
         Vector<String> usedAtts = new Vector<>();
         usedAtts.addElement(REF_ATTR);
 
-
-        String label = getLabel(e);
         String ref = e.getAttributeValue("", REF_ATTR);
 
         if (ref != null) {
@@ -1096,10 +1094,10 @@ private void parseGroupLabel(GroupDef g, Element e) {
                 throw new RuntimeException("malformed ref [" + ref + "] for <label>");
             }
         } else {
+            String label = getLabel(e);
             g.setLabelInnerText(label);
         }
 
-
         if (XFormUtils.showUnusedAttributeWarning(e, usedAtts)) {
             reporter.warning(XFormParserReporter.TYPE_UNKNOWN_MARKUP, XFormUtils.unusedAttWarning(e, usedAtts), getVagueLocation(e));
         }

From 5eb042692cb6adbc0237a51bde04654f6fa9dcfd Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Sat, 17 Aug 2024 00:11:02 +0530
Subject: [PATCH 2/7] Abstract Itext parsing logic into a method

---
 .../org/javarosa/xform/parse/XFormParser.java | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/javarosa/xform/parse/XFormParser.java b/src/main/java/org/javarosa/xform/parse/XFormParser.java
index 083c5e780e..8c180e8078 100755
--- a/src/main/java/org/javarosa/xform/parse/XFormParser.java
+++ b/src/main/java/org/javarosa/xform/parse/XFormParser.java
@@ -1082,25 +1082,30 @@ private void parseGroupLabel(GroupDef g, Element e) {
         Vector<String> usedAtts = new Vector<>();
         usedAtts.addElement(REF_ATTR);
 
-        String ref = e.getAttributeValue("", REF_ATTR);
+        String labelItextId = getItextReference(e);
+        g.setTextID(labelItextId);
+        if (labelItextId == null) {
+            String label = getLabel(e);
+            g.setLabelInnerText(label);
+        }
+
+        if (XFormUtils.showUnusedAttributeWarning(e, usedAtts)) {
+            reporter.warning(XFormParserReporter.TYPE_UNKNOWN_MARKUP, XFormUtils.unusedAttWarning(e, usedAtts), getVagueLocation(e));
+        }
+    }
 
+    private String getItextReference(Element e) {
+        String ref = e.getAttributeValue("", REF_ATTR);
         if (ref != null) {
             if (ref.startsWith(ITEXT_OPEN) && ref.endsWith(ITEXT_CLOSE)) {
                 String textRef = ref.substring(ITEXT_OPEN.length(), ref.indexOf(ITEXT_CLOSE));
-
                 verifyTextMappings(textRef, "Group <label>", true);
-                g.setTextID(textRef);
+                return textRef;
             } else {
-                throw new RuntimeException("malformed ref [" + ref + "] for <label>");
+                throw new XFormParseException("malformed ref [" + ref + "] for <label>");
             }
-        } else {
-            String label = getLabel(e);
-            g.setLabelInnerText(label);
-        }
-
-        if (XFormUtils.showUnusedAttributeWarning(e, usedAtts)) {
-            reporter.warning(XFormParserReporter.TYPE_UNKNOWN_MARKUP, XFormUtils.unusedAttWarning(e, usedAtts), getVagueLocation(e));
         }
+        return null;
     }
 
     private String getLabel(Element e) {
@@ -1510,6 +1515,7 @@ private void parseGroup(IFormElement parent, Element e, int groupType) {
         parent.addChild(group);
     }
 
+
     private TreeReference getFormElementRef(IFormElement fe) {
         if (fe instanceof FormDef) {
             TreeReference ref = TreeReference.rootRef();

From e4715add55ba8419450da6b0524ea38c66e4024a Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Sat, 17 Aug 2024 12:33:56 +0530
Subject: [PATCH 3/7] Change custom repat captions to have ref attr to define
 itext ids

---
 .../org/javarosa/xform/parse/XFormParser.java | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/javarosa/xform/parse/XFormParser.java b/src/main/java/org/javarosa/xform/parse/XFormParser.java
index 8c180e8078..a94098838c 100755
--- a/src/main/java/org/javarosa/xform/parse/XFormParser.java
+++ b/src/main/java/org/javarosa/xform/parse/XFormParser.java
@@ -1,5 +1,6 @@
 package org.javarosa.xform.parse;
 
+import org.commcare.cases.util.StringUtils;
 import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.DataBinding;
 import org.javarosa.core.model.FormDef;
@@ -1108,6 +1109,14 @@ private String getItextReference(Element e) {
         return null;
     }
 
+    private String getLabelOrTextId(Element element) {
+        String labelItextId = getItextReference(element);
+        if (!StringUtils.isEmpty(labelItextId)) {
+            return labelItextId;
+        }
+        return getLabel(element);
+    }
+
     private String getLabel(Element e) {
         if (e.getChildCount() == 0) return null;
 
@@ -1478,23 +1487,23 @@ private void parseGroup(IFormElement parent, Element e, int groupType) {
 
             if (group.isRepeat() && NAMESPACE_JAVAROSA.equals(childNamespace)) {
                 if ("chooseCaption".equals(childName)) {
-                    group.chooseCaption = getLabel(child);
+                    group.chooseCaption = getLabelOrTextId(child);
                 } else if ("addCaption".equals(childName)) {
-                    group.addCaption = getLabel(child);
+                    group.addCaption = getLabelOrTextId(child);
                 } else if ("delCaption".equals(childName)) {
-                    group.delCaption = getLabel(child);
+                    group.delCaption = getLabelOrTextId(child);
                 } else if ("doneCaption".equals(childName)) {
-                    group.doneCaption = getLabel(child);
+                    group.doneCaption = getLabelOrTextId(child);
                 } else if ("addEmptyCaption".equals(childName)) {
-                    group.addEmptyCaption = getLabel(child);
+                    group.addEmptyCaption = getLabelOrTextId(child);
                 } else if ("doneEmptyCaption".equals(childName)) {
-                    group.doneEmptyCaption = getLabel(child);
+                    group.doneEmptyCaption = getLabelOrTextId(child);
                 } else if ("entryHeader".equals(childName)) {
-                    group.entryHeader = getLabel(child);
+                    group.entryHeader = getLabelOrTextId(child);
                 } else if ("delHeader".equals(childName)) {
-                    group.delHeader = getLabel(child);
+                    group.delHeader = getLabelOrTextId(child);
                 } else if ("mainHeader".equals(childName)) {
-                    group.mainHeader = getLabel(child);
+                    group.mainHeader = getLabelOrTextId(child);
                 }
             }
         }

From 799ac7f7d5f9bdbfeac10f7e25e2ca7cefca4877 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Tue, 20 Aug 2024 14:43:52 +0530
Subject: [PATCH 4/7] Modify getRepeatText to use the itext key, test

---
 .../javarosa/form/api/FormEntryCaption.java   | 25 +++++---
 .../javarosa/core/model/test/FormDefTest.java | 18 ++++++
 .../{ => xform_tests}/sweet_repeat_demo.xml   | 60 ++++++++++++++++++-
 3 files changed, 95 insertions(+), 8 deletions(-)
 rename src/test/resources/{ => xform_tests}/sweet_repeat_demo.xml (50%)

diff --git a/src/main/java/org/javarosa/form/api/FormEntryCaption.java b/src/main/java/org/javarosa/form/api/FormEntryCaption.java
index 9beb6ec7d5..fa0aa4d711 100644
--- a/src/main/java/org/javarosa/form/api/FormEntryCaption.java
+++ b/src/main/java/org/javarosa/form/api/FormEntryCaption.java
@@ -1,5 +1,6 @@
 package org.javarosa.form.api;
 
+import org.commcare.cases.util.StringUtils;
 import org.javarosa.core.model.FormDef;
 import org.javarosa.core.model.FormIndex;
 import org.javarosa.core.model.GroupDef;
@@ -217,17 +218,17 @@ public String getRepeatText(String typeKey) {
 
         String caption = null;
         if ("mainheader".equals(typeKey)) {
-            caption = g.mainHeader;
+            caption = getCaptionText(g.mainHeader);
             if (caption == null) {
                 return title;
             }
         } else if ("add".equals(typeKey)) {
-            caption = g.addCaption;
+            caption = getCaptionText(g.addCaption);
             if (caption == null) {
                 return "Add another " + title;
             }
         } else if ("add-empty".equals(typeKey)) {
-            caption = g.addEmptyCaption;
+            caption = getCaptionText(g.addEmptyCaption);
             if (caption == null) {
                 caption = g.addCaption;
             }
@@ -235,17 +236,17 @@ public String getRepeatText(String typeKey) {
                 return "None - Add " + title;
             }
         } else if ("del".equals(typeKey)) {
-            caption = g.delCaption;
+            caption = getCaptionText(g.delCaption);
             if (caption == null) {
                 return "Delete " + title;
             }
         } else if ("done".equals(typeKey)) {
-            caption = g.doneCaption;
+            caption = getCaptionText(g.doneCaption);
             if (caption == null) {
                 return "Done";
             }
         } else if ("done-empty".equals(typeKey)) {
-            caption = g.doneEmptyCaption;
+            caption = getCaptionText(g.doneEmptyCaption);
             if (caption == null) {
                 caption = g.doneCaption;
             }
@@ -253,7 +254,7 @@ public String getRepeatText(String typeKey) {
                 return "Skip";
             }
         } else if ("delheader".equals(typeKey)) {
-            caption = g.delHeader;
+            caption = getCaptionText(g.delHeader);
             if (caption == null) {
                 return "Delete which " + title + "?";
             }
@@ -265,6 +266,16 @@ public String getRepeatText(String typeKey) {
         return form.fillTemplateString(caption, index.getReference(), vars);
     }
 
+    private String getCaptionText(String textIdOrText) {
+        if (!StringUtils.isEmpty(textIdOrText)) {
+            String returnText = getIText(textIdOrText, null);
+            if (returnText != null) {
+                return substituteStringArgs(returnText);
+            }
+        }
+        return substituteStringArgs(textIdOrText);
+    }
+
     //this should probably be somewhere better
     public int getNumRepetitions() {
         return form.getNumRepetitions(index);
diff --git a/src/test/java/org/javarosa/core/model/test/FormDefTest.java b/src/test/java/org/javarosa/core/model/test/FormDefTest.java
index bb569d6c2e..bba5ab49df 100644
--- a/src/test/java/org/javarosa/core/model/test/FormDefTest.java
+++ b/src/test/java/org/javarosa/core/model/test/FormDefTest.java
@@ -4,6 +4,8 @@
 import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.FormDef;
 import org.javarosa.core.model.FormIndex;
+import org.javarosa.core.model.GroupDef;
+import org.javarosa.core.model.IFormElement;
 import org.javarosa.core.model.QuestionDef;
 import org.javarosa.core.model.condition.EvaluationContext;
 import org.javarosa.core.model.condition.IFunctionHandler;
@@ -20,6 +22,7 @@
 import org.javarosa.core.model.instance.test.DummyInstanceInitializationFactory;
 import org.javarosa.core.model.utils.test.PersistableSandbox;
 import org.javarosa.core.test.FormParseInit;
+import org.javarosa.form.api.FormEntryCaption;
 import org.javarosa.form.api.FormEntryController;
 import org.javarosa.test_utils.ExprEvalUtils;
 import org.javarosa.xpath.parser.XPathSyntaxException;
@@ -666,4 +669,19 @@ public void testItemsetPopulationAndFilter() {
 
         } while (fec.stepToNextEvent() != FormEntryController.EVENT_END_OF_FORM);
     }
+
+    @Test
+    public void testRepeatCaptions() throws Exception {
+        FormParseInit fpi = new FormParseInit("/xform_tests/sweet_repeat_demo.xml");
+        FormEntryController fec = initFormEntry(fpi);
+        FormDef formDef = fec.getModel().getForm();
+        GroupDef repeat = (GroupDef)formDef.getChild(2);
+        assertEquals("main-header-label", repeat.mainHeader);
+        assertEquals("add-caption-label",repeat.addCaption);
+        assertEquals("add-empty-caption-label",repeat.addEmptyCaption);
+        assertEquals("del-caption-label",repeat.delCaption);
+        assertEquals("done-caption-label",repeat.doneCaption);
+        assertEquals("done-empty-caption-label",repeat.doneEmptyCaption);
+        assertEquals("choose-caption-label",repeat.chooseCaption);
+    }
 }
diff --git a/src/test/resources/sweet_repeat_demo.xml b/src/test/resources/xform_tests/sweet_repeat_demo.xml
similarity index 50%
rename from src/test/resources/sweet_repeat_demo.xml
rename to src/test/resources/xform_tests/sweet_repeat_demo.xml
index 80c41e46ad..13efea4332 100644
--- a/src/test/resources/sweet_repeat_demo.xml
+++ b/src/test/resources/xform_tests/sweet_repeat_demo.xml
@@ -17,6 +17,11 @@
                             <age/>
                             <sex/>
                         </child>
+                        <child_new jr:template="">
+                            <name/>
+                            <age/>
+                            <sex/>
+                        </child_new>
                     </children>
 
                     <qq/>
@@ -26,7 +31,31 @@
             </instance>
 
             <bind nodeset="children/child/age" type="int"/>
-
+            <itext>
+                <translation lang="en" default="">
+                    <text id="main-header-label">
+                        <value>Main Header Label</value>
+                    </text>
+                    <text id="add-caption-label">
+                        <value>Add Caption Label</value>
+                    </text>
+                    <text id="add-empty-caption-label">
+                        <value>Add Empty Caption Label</value>
+                    </text>
+                    <text id="del-caption-label">
+                        <value>Delete Caption Label</value>
+                    </text>
+                    <text id="done-caption-label">
+                        <value>Done Caption Label</value>
+                    </text>
+                    <text id="done-empty-caption-label">
+                        <value>Done Empty Caption Label</value>
+                    </text>
+                    <text id="choose-caption-label">
+                        <value>Choose Caption Label</value>
+                    </text>
+                </translation>
+            </itext>
         </model>
     </h:head>
     <h:body>
@@ -78,7 +107,36 @@
                 </select1>
             </repeat>
         </group>
+        <group>
+            <label>child</label>
+            <repeat nodeset="children/child_new">
+                <jr:mainHeader ref="jr:itext('main-header-label')" />
+                <jr:addCaption ref="jr:itext('add-caption-label')" />
+                <jr:addEmptyCaption ref="jr:itext('add-empty-caption-label')" />
+                <jr:delCaption ref="jr:itext('del-caption-label')" />
+                <jr:doneCaption ref="jr:itext('done-caption-label')" />
+                <jr:doneEmptyCaption ref="jr:itext('done-empty-caption-label')" />
+                <jr:chooseCaption ref="jr:itext('choose-caption-label')" />
 
+                <input ref="name">
+                    <label>name</label>
+                </input>
+                <input ref="age">
+                    <label>age</label>
+                </input>
+                <select1 ref="sex">
+                    <label>sex</label>
+                    <item>
+                        <label>Male</label>
+                        <value>M</value>
+                    </item>
+                    <item>
+                        <label>Female</label>
+                        <value>F</value>
+                    </item>
+                </select1>
+            </repeat>
+        </group>
         <input ref="qq">
             <label>post q</label>
         </input>

From 58b8829fed95e7ae660017b47e6059c204569c39 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Wed, 21 Aug 2024 11:45:33 +0530
Subject: [PATCH 5/7] Adds getCaptionText for entryHeader and chooseCaption as
 well

---
 .../org/javarosa/form/api/FormEntryCaption.java     |  6 +++---
 .../org/javarosa/core/model/test/FormDefTest.java   | 13 +++++++------
 .../resources/xform_tests/sweet_repeat_demo.xml     |  4 ++++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/javarosa/form/api/FormEntryCaption.java b/src/main/java/org/javarosa/form/api/FormEntryCaption.java
index fa0aa4d711..5bf93bb776 100644
--- a/src/main/java/org/javarosa/form/api/FormEntryCaption.java
+++ b/src/main/java/org/javarosa/form/api/FormEntryCaption.java
@@ -295,11 +295,11 @@ private String getRepetitionText(String type, FormIndex index, boolean newrep) {
 
             String caption = null;
             if ("header".equals(type)) {
-                caption = g.entryHeader;
+                caption = getCaptionText(g.entryHeader);
             } else if ("choose".equals(type)) {
-                caption = g.chooseCaption;
+                caption = getCaptionText(g.chooseCaption);
                 if (caption == null) {
-                    caption = g.entryHeader;
+                    caption = getCaptionText(g.entryHeader);
                 }
             }
             if (caption == null) {
diff --git a/src/test/java/org/javarosa/core/model/test/FormDefTest.java b/src/test/java/org/javarosa/core/model/test/FormDefTest.java
index bba5ab49df..be1672cfa4 100644
--- a/src/test/java/org/javarosa/core/model/test/FormDefTest.java
+++ b/src/test/java/org/javarosa/core/model/test/FormDefTest.java
@@ -677,11 +677,12 @@ public void testRepeatCaptions() throws Exception {
         FormDef formDef = fec.getModel().getForm();
         GroupDef repeat = (GroupDef)formDef.getChild(2);
         assertEquals("main-header-label", repeat.mainHeader);
-        assertEquals("add-caption-label",repeat.addCaption);
-        assertEquals("add-empty-caption-label",repeat.addEmptyCaption);
-        assertEquals("del-caption-label",repeat.delCaption);
-        assertEquals("done-caption-label",repeat.doneCaption);
-        assertEquals("done-empty-caption-label",repeat.doneEmptyCaption);
-        assertEquals("choose-caption-label",repeat.chooseCaption);
+        assertEquals("add-caption-label", repeat.addCaption);
+        assertEquals("add-empty-caption-label", repeat.addEmptyCaption);
+        assertEquals("del-caption-label", repeat.delCaption);
+        assertEquals("done-caption-label", repeat.doneCaption);
+        assertEquals("done-empty-caption-label", repeat.doneEmptyCaption);
+        assertEquals("choose-caption-label", repeat.chooseCaption);
+        assertEquals("entry-header-label", repeat.entryHeader);
     }
 }
diff --git a/src/test/resources/xform_tests/sweet_repeat_demo.xml b/src/test/resources/xform_tests/sweet_repeat_demo.xml
index 13efea4332..a12d003f5f 100644
--- a/src/test/resources/xform_tests/sweet_repeat_demo.xml
+++ b/src/test/resources/xform_tests/sweet_repeat_demo.xml
@@ -54,6 +54,9 @@
                     <text id="choose-caption-label">
                         <value>Choose Caption Label</value>
                     </text>
+                    <text id="entry-header-label">
+                        <value>Entry Header Label</value>
+                    </text>
                 </translation>
             </itext>
         </model>
@@ -117,6 +120,7 @@
                 <jr:doneCaption ref="jr:itext('done-caption-label')" />
                 <jr:doneEmptyCaption ref="jr:itext('done-empty-caption-label')" />
                 <jr:chooseCaption ref="jr:itext('choose-caption-label')" />
+                <jr:entryHeader ref="jr:itext('entry-header-label')" />
 
                 <input ref="name">
                     <label>name</label>

From cb5064af9653da2737040d990f60557e72284130 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Wed, 21 Aug 2024 13:27:01 +0530
Subject: [PATCH 6/7] Adds another getCaptionText wrapper

---
 src/main/java/org/javarosa/form/api/FormEntryCaption.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/javarosa/form/api/FormEntryCaption.java b/src/main/java/org/javarosa/form/api/FormEntryCaption.java
index 5bf93bb776..413c74eab6 100644
--- a/src/main/java/org/javarosa/form/api/FormEntryCaption.java
+++ b/src/main/java/org/javarosa/form/api/FormEntryCaption.java
@@ -230,7 +230,7 @@ public String getRepeatText(String typeKey) {
         } else if ("add-empty".equals(typeKey)) {
             caption = getCaptionText(g.addEmptyCaption);
             if (caption == null) {
-                caption = g.addCaption;
+                caption = getCaptionText(g.addCaption);
             }
             if (caption == null) {
                 return "None - Add " + title;

From 9189a584a2e4e615174c0231fe315a82b6d1b2f1 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Wed, 21 Aug 2024 16:15:31 +0530
Subject: [PATCH 7/7] adds localization for default value of repeat add caption

---
 src/main/java/org/javarosa/form/api/FormEntryCaption.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/javarosa/form/api/FormEntryCaption.java b/src/main/java/org/javarosa/form/api/FormEntryCaption.java
index 413c74eab6..8fdb23d4fb 100644
--- a/src/main/java/org/javarosa/form/api/FormEntryCaption.java
+++ b/src/main/java/org/javarosa/form/api/FormEntryCaption.java
@@ -5,6 +5,7 @@
 import org.javarosa.core.model.FormIndex;
 import org.javarosa.core.model.GroupDef;
 import org.javarosa.core.model.IFormElement;
+import org.javarosa.core.services.locale.Localization;
 import org.javarosa.core.services.locale.Localizer;
 
 import java.util.Hashtable;
@@ -225,7 +226,8 @@ public String getRepeatText(String typeKey) {
         } else if ("add".equals(typeKey)) {
             caption = getCaptionText(g.addCaption);
             if (caption == null) {
-                return "Add another " + title;
+                return Localization.getWithDefault("repeat.dialog.add.another", new String[]{title},
+                        "Add another " + title);
             }
         } else if ("add-empty".equals(typeKey)) {
             caption = getCaptionText(g.addEmptyCaption);
@@ -233,7 +235,8 @@ public String getRepeatText(String typeKey) {
                 caption = getCaptionText(g.addCaption);
             }
             if (caption == null) {
-                return "None - Add " + title;
+                return Localization.getWithDefault("repeat.dialog.add.new", new String[]{title},
+                        "Add a new " + title);
             }
         } else if ("del".equals(typeKey)) {
             caption = getCaptionText(g.delCaption);