From 6900a5ccf82ba88c7d3556a71f8e6c709f1fa091 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 30 Nov 2016 21:23:09 -0500
Subject: [PATCH] Removed unnecessary localized string for style installation
 error

Would only be used for an external request that didn't pass along a
filename or origin, so "null" (or whatever it shows up as) is fine
---
 chrome/content/zotero/xpcom/style.js         | 5 ++---
 chrome/locale/en-US/zotero/zotero.properties | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/xpcom/style.js b/chrome/content/zotero/xpcom/style.js
index 79192046cd..93b6069d0c 100644
--- a/chrome/content/zotero/xpcom/style.js
+++ b/chrome/content/zotero/xpcom/style.js
@@ -246,7 +246,6 @@ Zotero.Styles = new function() {
 	 */
 	this.install = Zotero.Promise.coroutine(function* (style, origin, silent=false) {
 		var styleTitle;
-		origin = origin || Zotero.getString('styles.unknownOrigin');
 		
 		try {
 			if (style instanceof Components.interfaces.nsIFile) {
@@ -262,9 +261,9 @@ Zotero.Styles = new function() {
 			// Unless user cancelled, show an alert with the error
 			if(typeof error === "object" && error instanceof Zotero.Exception.UserCancelled) return;
 			if(typeof error === "object" && error instanceof Zotero.Exception.Alert) {
-				error.log();
+				Zotero.logError(error);
 				if (silent) {
-					throw (error)
+					throw error;
 				} else {
 					error.present();
 				}
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 2941eac88f..e242cbbf08 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -832,7 +832,6 @@ styles.validationWarning			= "%S" is not a valid CSL 1.0.1 style file, and may n
 styles.installSourceError			= %1$S references an invalid or non-existent CSL file at %2$S as its source.
 styles.deleteStyle					= Are you sure you want to delete the style "%1$S"?
 styles.deleteStyles					= Are you sure you want to delete the selected styles?
-styles.unknownOrigin				= External Style
 
 styles.abbreviations.title			= Load Abbreviations
 styles.abbreviations.parseError		= The abbreviations file "%1$S" is not valid JSON.