From c5c398923ac85de4c31b4d0a441ac8b5f078d024 Mon Sep 17 00:00:00 2001
From: Karoline Tufte Lien <karoline@dhis2.org>
Date: Fri, 24 Apr 2026 15:31:19 +0200
Subject: [PATCH] fix(ou-dimension): prevent apostrophes in org unit names from
 being HTML-escaped in display text

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/components/OrgUnitDimension/OrgUnitDimension.js | 1 +
 src/modules/getOuLevelAndGroupText.js               | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/components/OrgUnitDimension/OrgUnitDimension.js b/src/components/OrgUnitDimension/OrgUnitDimension.js
index 1e3cef1d2..3f0a41212 100644
--- a/src/components/OrgUnitDimension/OrgUnitDimension.js
+++ b/src/components/OrgUnitDimension/OrgUnitDimension.js
@@ -175,6 +175,7 @@ const OrgUnitDimension = ({
                 {
                     keySeparator: '>',
                     nsSeparator: '|',
+                    interpolation: { escapeValue: false },
                     commaSeparatedListOfOrganisationUnits: formatList(parts),
                 }
             )
diff --git a/src/modules/getOuLevelAndGroupText.js b/src/modules/getOuLevelAndGroupText.js
index a7622e28f..08a9c0ee4 100644
--- a/src/modules/getOuLevelAndGroupText.js
+++ b/src/modules/getOuLevelAndGroupText.js
@@ -49,6 +49,7 @@ const getLevelAndGroupText = (items, metaData, isLevel) => {
             ouIdHelper.removePrefix(lastItem.id)
         )
         allDynamicOuNames = i18n.t('{{dynamicOuNames}} and {{lastOuName}}', {
+            interpolation: { escapeValue: false },
             dynamicOuNames,
             lastOuName,
         })
@@ -69,10 +70,12 @@ const getLevelAndGroupText = (items, metaData, isLevel) => {
     if (!staticOuNames) {
         if (isLevel) {
             ouLevelAndGroupText = i18n.t('{{allDynamicOuNames}} levels', {
+                interpolation: { escapeValue: false },
                 allDynamicOuNames,
             })
         } else {
             ouLevelAndGroupText = i18n.t('{{allDynamicOuNames}} groups', {
+                interpolation: { escapeValue: false },
                 allDynamicOuNames,
             })
         }
@@ -81,6 +84,7 @@ const getLevelAndGroupText = (items, metaData, isLevel) => {
             ouLevelAndGroupText = i18n.t(
                 '{{allDynamicOuNames}} levels in {{staticOuNames}}',
                 {
+                    interpolation: { escapeValue: false },
                     allDynamicOuNames,
                     staticOuNames,
                 }
@@ -89,6 +93,7 @@ const getLevelAndGroupText = (items, metaData, isLevel) => {
             ouLevelAndGroupText = i18n.t(
                 '{{allDynamicOuNames}} groups in {{staticOuNames}}',
                 {
+                    interpolation: { escapeValue: false },
                     allDynamicOuNames,
                     staticOuNames,
                 }