From 84882c8ecf8b3be28d55c328d62d4a15db97f886 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 27 Nov 2013 16:08:31 -0500 Subject: [PATCH] Include actual error in "There was an error starting Zotero." dialog And use a proper title --- chrome/content/zotero/xpcom/zotero.js | 2 ++ chrome/content/zotero/zoteroPane.js | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index 2d9bc271a..10832e6a6 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -831,6 +831,8 @@ Components.utils.import("resource://gre/modules/osfile.jsm"); Zotero.getString(Zotero.isStandalone ? 'startupError.closeFirefox' : 'startupError.closeStandalone') ]); Zotero.startupError = msg; + } else { + Zotero.startupError = Zotero.getString('startupError') + "\n\n" + e; } Zotero.debug(e.toString(), 1); diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js index 019b981cd..a21554020 100644 --- a/chrome/content/zotero/zoteroPane.js +++ b/chrome/content/zotero/zoteroPane.js @@ -3997,16 +3997,17 @@ var ZoteroPane = new function() var errFunc = Zotero.startupErrorHandler; } + // Get the stringbundle manually + var src = 'chrome://zotero/locale/zotero.properties'; + var localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1']. + getService(Components.interfaces.nsILocaleService); + var appLocale = localeService.getApplicationLocale(); + var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"] + .getService(Components.interfaces.nsIStringBundleService); + var stringBundle = stringBundleService.createBundle(src, appLocale); + + var title = stringBundle.GetStringFromName('general.error'); if (!errMsg) { - // Get the stringbundle manually - var src = 'chrome://zotero/locale/zotero.properties'; - var localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1']. - getService(Components.interfaces.nsILocaleService); - var appLocale = localeService.getApplicationLocale(); - var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"] - .getService(Components.interfaces.nsIStringBundleService); - var stringBundle = stringBundleService.createBundle(src, appLocale); - var errMsg = stringBundle.GetStringFromName('startupError'); } @@ -4022,7 +4023,7 @@ var ZoteroPane = new function() //} else { var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] .getService(Components.interfaces.nsIPromptService); - ps.alert(null, "", errMsg); + ps.alert(null, title, errMsg); //} } }