From 87c71f74a0d42ddc1659c9d3d2ee4e8854e69617 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 7 May 2023 04:53:29 -0400
Subject: [PATCH] Move `-app-name` variable to brand.ftl

So a custom build doesn't have to modify each .ftl file

`app-name` is redundant with the Firefox strings, but it's what we used
previously and is easier to remember.
---
 app/assets/branding/locale/brand.ftl            | 3 ++-
 chrome/content/zotero/elements/base.js          | 1 +
 chrome/content/zotero/import/importWizard.xhtml | 1 +
 chrome/content/zotero/publicationsDialog.xhtml  | 1 +
 chrome/content/zotero/rtfScan.xhtml             | 1 +
 chrome/locale/en-US/zotero/zotero.ftl           | 2 --
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/branding/locale/brand.ftl b/app/assets/branding/locale/brand.ftl
index 3afa9eddd1..896ddc864f 100644
--- a/app/assets/branding/locale/brand.ftl
+++ b/app/assets/branding/locale/brand.ftl
@@ -3,4 +3,5 @@
 -brand-full-name = Zotero
 -brand-product-name = Zotero
 -vendor-short-name = Zotero
-trademarkInfo = Zotero is a trademark of the Corporation for Digital Scholarship.
\ No newline at end of file
+-app-name = Zotero
+trademarkInfo = Zotero is a trademark of the Corporation for Digital Scholarship.
diff --git a/chrome/content/zotero/elements/base.js b/chrome/content/zotero/elements/base.js
index 8bd8048003..c557ae5ba8 100644
--- a/chrome/content/zotero/elements/base.js
+++ b/chrome/content/zotero/elements/base.js
@@ -42,6 +42,7 @@ class XULElementBase extends XULElement {
 			this.append(content);
 		}
 
+		MozXULElement.insertFTLIfNeeded("branding/brand.ftl");
 		MozXULElement.insertFTLIfNeeded("zotero.ftl");
 		if (document.l10n && this.shadowRoot) {
 			document.l10n.connectRoot(this.shadowRoot);
diff --git a/chrome/content/zotero/import/importWizard.xhtml b/chrome/content/zotero/import/importWizard.xhtml
index e282fc7cfe..79a1332539 100644
--- a/chrome/content/zotero/import/importWizard.xhtml
+++ b/chrome/content/zotero/import/importWizard.xhtml
@@ -10,6 +10,7 @@
 		onload="Zotero_Import_Wizard.init()"
 >
 	<linkset>
+		<html:link rel="localization" href="branding/brand.ftl" />
 		<html:link rel="localization" href="zotero.ftl" />
 	</linkset>
 
diff --git a/chrome/content/zotero/publicationsDialog.xhtml b/chrome/content/zotero/publicationsDialog.xhtml
index eb7110cdd6..09dda6c6bc 100644
--- a/chrome/content/zotero/publicationsDialog.xhtml
+++ b/chrome/content/zotero/publicationsDialog.xhtml
@@ -33,6 +33,7 @@
 		onload="Zotero_Publications_Dialog.init()"
 >
 	<linkset>
+		<html:link rel="localization" href="branding/brand.ftl" />
 		<html:link rel="localization" href="zotero.ftl" />
 	</linkset>
 	
diff --git a/chrome/content/zotero/rtfScan.xhtml b/chrome/content/zotero/rtfScan.xhtml
index 453773b4bb..1b1d1a5bf7 100644
--- a/chrome/content/zotero/rtfScan.xhtml
+++ b/chrome/content/zotero/rtfScan.xhtml
@@ -10,6 +10,7 @@
 		onload="Zotero_RTFScan.init()"
 >
 	<linkset>
+		<html:link rel="localization" href="branding/brand.ftl" />
 		<html:link rel="localization" href="zotero.ftl" />
 	</linkset>
 	
diff --git a/chrome/locale/en-US/zotero/zotero.ftl b/chrome/locale/en-US/zotero/zotero.ftl
index 17b1ff77a0..cbabdf1399 100644
--- a/chrome/locale/en-US/zotero/zotero.ftl
+++ b/chrome/locale/en-US/zotero/zotero.ftl
@@ -1,5 +1,3 @@
--app-name = Zotero 
-
 import-wizard =
     .title = "Import"