From 5bd5bfa343529bd1bee204c81d398c17197623a8 Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Tue, 3 Sep 2024 10:24:01 -0400
Subject: [PATCH] Resolve XML entities in parsed strings (#4664)

---
 chrome/content/zotero/xpcom/intl.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/intl.js b/chrome/content/zotero/xpcom/intl.js
index 76da2c7b50..d9751a2254 100644
--- a/chrome/content/zotero/xpcom/intl.js
+++ b/chrome/content/zotero/xpcom/intl.js
@@ -94,12 +94,19 @@ Zotero.Intl = new function () {
 		const intlFiles = ['zotero.dtd', 'preferences.dtd', 'mozilla/editMenuOverlay.dtd'];
 
 		let strings = [];
+		let { documentElement: elem } = new DOMParser().parseFromString('<root></root>', 'application/xml');
 		for (let intlFile of intlFiles) {
 			let localeXML = Zotero.File.getContentsFromURL(`chrome://zotero/locale/${intlFile}`);
 			let regexp = /<!ENTITY ([^\s]+)\s+"([^"]+)/g;
 			let regexpResult;
 			while ((regexpResult = regexp.exec(localeXML))) {
-				strings[regexpResult[1]] = regexpResult[2];
+				let key = regexpResult[1];
+				let value = regexpResult[2];
+				// Resolve XML entities
+				elem.innerHTML = value;
+				value = elem.textContent;
+
+				strings[key] = value;
 			}
 		}
 		return strings;