diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js index 582f63c1bf..75e7fffe79 100644 --- a/chrome/content/zotero/xpcom/db.js +++ b/chrome/content/zotero/xpcom/db.js @@ -1287,7 +1287,7 @@ Zotero.DBConnection.prototype._handleCorruptionMarker = async function () { Zotero.alert( null, - Zotero.getString('startupError'), + Zotero.getString('startupError', Zotero.appName), Zotero.getString( 'db.dbCorruptedNoBackup', [Zotero.appName, fileName, OS.Path.basename(damagedFile)] diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js index 3f97f26315..54912f009e 100644 --- a/chrome/content/zotero/xpcom/schema.js +++ b/chrome/content/zotero/xpcom/schema.js @@ -2214,7 +2214,11 @@ Zotero.Schema = new function(){ Components.utils.reportError(e); let ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] .getService(Components.interfaces.nsIPromptService); - ps.alert(null, Zotero.getString('general.error'), Zotero.getString('startupError')); + ps.alert( + null, + Zotero.getString('general.error'), + Zotero.getString('startupError', Zotero.appName) + ); throw e; }); } diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index 6125dfcdf9..28617e491e 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -751,7 +751,9 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js"); catch (e) { Zotero.logError(e); if (!Zotero.startupError) { - Zotero.startupError = Zotero.getString('startupError') + "\n\n" + (e.stack || e); + Zotero.startupError = Zotero.getString('startupError', Zotero.appName) + "\n\n" + + Zotero.getString('db.integrityCheck.reportInForums') + "\n\n" + + (e.stack || e); } return false; } @@ -807,7 +809,9 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js"); } else { let stack = e.stack ? Zotero.Utilities.Internal.filterStack(e.stack) : null; - Zotero.startupError = Zotero.getString('startupError') + "\n\n" + (stack || e); + Zotero.startupError = Zotero.getString('startupError', Zotero.appName) + "\n\n" + + Zotero.getString('db.integrityCheck.reportInForums') + "\n\n" + + (stack || e); } Zotero.debug(e.toString(), 1); diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index cf2c84352b..876c3b6398 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -187,7 +187,7 @@ dataDir.migration.failure.full.showCurrentDirectoryAndQuit = Show Current Direct app.standalone = Zotero Standalone app.firefox = Zotero for Firefox -startupError = There was an error starting Zotero. +startupError = There was an error starting %S. startupError.databaseInUse = Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time. startupError.closeStandalone = If Zotero Standalone is open, please close it and restart Firefox. startupError.closeFirefox = If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.