fix: prevent html duplication in android bucket (#1647)

* fix: prevent HTML tag duplication in Android XML strings

* chore: add changeset

Author: vrcprl

.changeset/stale-pandas-run.md

@@ -0,0 +1,5 @@
+---
+"lingo.dev": patch
+---
+
+prevent HTML tag duplication in Android bucket

packages/cli/demo/android/en/example.xml

@@ -95,7 +95,11 @@
         <item>@drawable/icon2</item>
     </array>
 
+    <string name="terms_of_use_raw"><u>Terms of Use</u></string>
+
     <!-- Resource IDs - will not be translated (copied as-is to target locales) -->
     <item type="id" name="button_ok" />
 
+    <string name="view_your_options"><u>View your options</u></string>
+
 </resources>

packages/cli/demo/android/es/example.xml

@@ -23,7 +23,7 @@
 
     <string name="html_snippet">&lt;b&gt;Negrita&lt;/b&gt;</string>
 
-    <string name="apostrophe_example">¡No olvides!</string>
+    <string name="apostrophe_example">¡No lo olvides!</string>
 
     <string name="cdata_example"><![CDATA[Los usuarios solo pueden ver tu comentario después de registrarse. <u>Más información.</u>]]></string>
 
@@ -49,6 +49,10 @@
         <item>@drawable/icon2</item>
     </array>
 
+    <string name="terms_of_use_raw">&lt;u&gt;Términos de uso&lt;/u&gt;</string>
+
     <item type="id" name="button_ok"></item>
 
+    <string name="view_your_options">&lt;u&gt;Ver tus opciones&lt;/u&gt;</string>
+
 </resources>

packages/cli/demo/android/i18n.lock

@@ -4,13 +4,14 @@ checksums:
     app_name: 7dc70110429d46e3685f385bd2cc941c
     welcome_message: 0468579ef2fbc83c9d520c2f2f1c5059
     button_text: 1d5f030c4ec9c869e647ae060518b948
-    html_snippet: f060191b1af70b3848106a4df91f43cd
-    apostrophe_example: 997099339b144b06266f8da411de8d93
-    cdata_example: ba876d1379f854628eaebf67ea330ccc
     color_names/0: bace0083b78cdb188523bc4abc7b55c6
     color_names/1: 482ff383a4258357ba404f283682471d
-    color_names/2: a5cf034b2d370a976119335cd99f4217
-    mixed_items/0: 9278f79dfb062c6c04f6395108907816
-    mixed_items/1: 9823a57cbe6e6e84c1d025ce24a1eec4
+    color_names/2: a3f56a5c28ea75888356c2280aadc0e7
     notification_count/one: fe0aceb70f334c52a87937c36898a1d0
     notification_count/other: 13acfd95b16962ebe1f67dcd343513e1
+    html_snippet: f060191b1af70b3848106a4df91f43cd
+    apostrophe_example: 997099339b144b06266f8da411de8d93
+    cdata_example: b88d55f92c4a90f64016e497051e997d
+    mixed_items/0: 31c5d470a2fe8e1ae88e964fc673aee3
+    mixed_items/1: 9823a57cbe6e6e84c1d025ce24a1eec4
+    terms_of_use_raw: e3048f75742e66473369a83c10ea95c3

packages/cli/i18n.lock

@@ -422,6 +422,8 @@ checksums:
     cdata_example: b88d55f92c4a90f64016e497051e997d
     mixed_items/0: 31c5d470a2fe8e1ae88e964fc673aee3
     mixed_items/1: 9823a57cbe6e6e84c1d025ce24a1eec4
+    terms_of_use_raw: e3048f75742e66473369a83c10ea95c3
+    view_your_options: 416ed59ca3254f9da0d565c7c75f9033
   df547e152136431bbc29e26ae0eeabb4:
     title: 0468579ef2fbc83c9d520c2f2f1c5059
     description: 49f8864eb0e53903f04532bf33e1e4fa

packages/cli/src/cli/loaders/android.spec.ts

@@ -94,6 +94,34 @@ describe("android loader", () => {
     });
   });
 
+  it("should correctly handle HTML markup in strings during push without duplication", async () => {
+    const input = `
+      <resources>
+        <string name="terms_of_use"><u>Terms of Use</u></string>
+        <string name="welcome">Welcome to <b>Android</b>!</string>
+      </resources>
+    `.trim();
+
+    const androidLoader = createAndroidLoader().setDefaultLocale("en");
+
+    // Pull first to initialize loader state
+    await androidLoader.pull("en", input);
+
+    // Push translated content with HTML
+    const pushed = await androidLoader.push("es", {
+      terms_of_use: "<u>Términos de uso</u>",
+      welcome: "Bienvenido a <b>Android</b>!",
+    });
+
+    // Verify no duplication - should only contain escaped HTML, not both escaped and unescaped
+    expect(pushed).toContain("&lt;u&gt;Términos de uso&lt;/u&gt;");
+    expect(pushed).not.toContain("<u>Términos de uso</u>&lt;u&gt;");
+    expect(pushed).not.toContain("&lt;u&gt;Terms of Use&lt;/u&gt;&lt;u&gt;Términos de uso&lt;/u&gt;");
+
+    expect(pushed).toContain("&lt;b&gt;Android&lt;/b&gt;");
+    expect(pushed).not.toContain("<b>Android</b>&lt;b&gt;");
+  });
+
   it("should correctly handle format strings", async () => {
     const input = `
       <resources>

packages/cli/src/cli/loaders/android.ts

@@ -641,19 +641,12 @@ function setTextualNodeContent(
     : escapeAndroidString(value);
   node._ = escapedValue;
 
-  node.$$ = node.$$ ?? [];
-  let textNode = node.$$.find(
-    (child: any) =>
-      child["#name"] === "__text__" || child["#name"] === "__cdata",
-  );
-
-  if (!textNode) {
-    textNode = {};
-    node.$$.push(textNode);
-  }
-
-  textNode["#name"] = useCdata ? "__cdata" : "__text__";
-  textNode._ = escapedValue;
+  // Replace entire children array to avoid duplicating inline HTML elements
+  // When inline HTML exists (e.g., <b>text</b>), xml2js creates element nodes
+  // in node.$$ that would otherwise be serialized alongside the escaped text
+  node.$$ = [
+    { "#name": useCdata ? "__cdata" : "__text__", _: escapedValue }
+  ];
 }
 
 function buildResourceNameMap(