From 3089685b336c69ca070b10182de8308c39d4a048 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 21 Feb 2015 20:33:58 -0500
Subject: [PATCH] Fix display of some startup errors in toolbar icon tooltip

---
 chrome/content/zotero/icon.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/chrome/content/zotero/icon.js b/chrome/content/zotero/icon.js
index ae12e8c8b..2469ed646 100644
--- a/chrome/content/zotero/icon.js
+++ b/chrome/content/zotero/icon.js
@@ -175,19 +175,19 @@ function getTooltipText(button) {
 			if (key) {
 				// Add RLE mark in RTL mode to make shortcut render the right way
 				text += (Zotero.rtl ? ' \u202B' : ' ') + '('
-				+ (Zotero.isMac ? '⇧⌘' : Zotero.getString('general.keys.ctrlShift'))
-				+ key
-				+ ')';
+					+ (Zotero.isMac ? '⇧⌘' : Zotero.getString('general.keys.ctrlShift'))
+					+ key
+					+ ')';
 			}
 			
 		}
 		else {
 			if (Zotero) {
-				var errMsg = Zotero.startupError;
+				text = Zotero.startupError;
 			}
 			
 			// Use defaults if necessary
-			if (!errMsg) {
+			if (!text) {
 				// Get the stringbundle manually
 				let src = 'chrome://zotero/locale/zotero.properties';
 				let localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1']
@@ -203,6 +203,7 @@ function getTooltipText(button) {
 	
 	case 'save':
 		text = Zotero.getString('ingester.saveToZotero');
+		break;
 	}
 	return text;
 }