From 918570479e489a9de464b8ef3dae808b25a03436 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 24 Dec 2021 02:06:39 -0500 Subject: [PATCH] Hard-code "storage" in error when trying to set data dir to 'storage' --- chrome/content/zotero/xpcom/dataDirectory.js | 2 +- chrome/locale/en-US/zotero/zotero.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/dataDirectory.js b/chrome/content/zotero/xpcom/dataDirectory.js index 7847d8dff3..01651324f8 100644 --- a/chrome/content/zotero/xpcom/dataDirectory.js +++ b/chrome/content/zotero/xpcom/dataDirectory.js @@ -473,7 +473,7 @@ Zotero.DataDirectory = { let index = ps.confirmEx( null, Zotero.getString('general.error'), - Zotero.getString('dataDir.cannotBeSetWithAlternative', [parentPath]), + Zotero.getString('dataDir.cannotBeSetWithAlternative', ['storage', parentPath]), buttonFlags, null, null, null, null, {} ); diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 30ba5bf55a..834ab8535f 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -170,7 +170,7 @@ dataDir.selectDir = Select a Zotero data directory dataDir.selectNewDir = Select a new %S data directory dataDir.changeDataDirectory = Change Data Directory… dataDir.chooseNewDataDirectory = Choose New Data Directory… -dataDir.cannotBeSetWithAlternative = The data directory cannot be set to a “storage” directory. Did you mean %S? +dataDir.cannotBeSetWithAlternative = The data directory cannot be set to a “%S” directory. Did you mean %S? dataDir.cannotBeLinkedAttachmentBaseDirectory = The data directory cannot be set to the same location as the Linked Attachment Base Directory. dataDir.unsafeLocation.selected.cloud = Storing the data directory in a cloud storage folder is very likely to corrupt your database. dataDir.unsafeLocation.selected.areYouSure = Are you sure you want to use this location?