Fix code misstep resulting from upstream merge

Juris-M · Feb 11, 2018 · 68f4d0c · 68f4d0c
1 parent 2d8918a
commit 68f4d0c
Showing 1 changed file with 42 additions and 43 deletions.
diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
@@ -582,49 +582,6 @@ Zotero.Cite.System.prototype = {
 	 */
 	"retrieveLocale":function retrieveLocale(lang) {
 		return Zotero.Cite.Locale.get(lang);
-	}
-};
-
-Zotero.Cite.Locale = {
-	_cache: new Map(),
-
-	get: function (locale) {
-		var str = this._cache.get(locale);
-		if (str) {
-			return str;
-		}
-		var uri = `chrome://zotero/content/locale/csl/locales-${locale}.xml`;
-		try {
-			let protHandler = Components.classes["@mozilla.org/network/protocol;1?name=chrome"]
-				.createInstance(Components.interfaces.nsIProtocolHandler);
-			let channel = protHandler.newChannel(protHandler.newURI(uri));
-			let cstream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
-				.createInstance(Components.interfaces.nsIConverterInputStream);
-			cstream.init(channel.open(), "UTF-8", 0, 0);
-			let obj = {};
-			let read = 0;
-			let str = "";
-			do {
-				// Read as much as we can and put it in obj.value
-				read = cstream.readString(0xffffffff, obj);
-				str += obj.value;
-			} while (read != 0);
-			cstream.close();
-			this._cache.set(locale, str);
-			return str;
-		}
-		catch (e) {
-			//Zotero.debug(e);
-			return false;
-		}
-		var converterStream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
-							   .createInstance(Components.interfaces.nsIConverterInputStream);
-		converterStream.init(rawStream, "UTF-8", 65535,
-			Components.interfaces.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
-		var str = {};
-		converterStream.readString(channel.contentLength, str);
-		converterStream.close();
-		return str.value;
 	},
 
 	"normalizeAbbrevsKey": function (key) {
@@ -751,7 +708,49 @@ Zotero.Cite.Locale = {
 		// purpose.
 		return Zotero.CachedLanguages.getNickname(str);
 	}
+};
 
+Zotero.Cite.Locale = {
+	_cache: new Map(),
+
+	get: function (locale) {
+		var str = this._cache.get(locale);
+		if (str) {
+			return str;
+		}
+		var uri = `chrome://zotero/content/locale/csl/locales-${locale}.xml`;
+		try {
+			let protHandler = Components.classes["@mozilla.org/network/protocol;1?name=chrome"]
+				.createInstance(Components.interfaces.nsIProtocolHandler);
+			let channel = protHandler.newChannel(protHandler.newURI(uri));
+			let cstream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
+				.createInstance(Components.interfaces.nsIConverterInputStream);
+			cstream.init(channel.open(), "UTF-8", 0, 0);
+			let obj = {};
+			let read = 0;
+			let str = "";
+			do {
+				// Read as much as we can and put it in obj.value
+				read = cstream.readString(0xffffffff, obj);
+				str += obj.value;
+			} while (read != 0);
+			cstream.close();
+			this._cache.set(locale, str);
+			return str;
+		}
+		catch (e) {
+			//Zotero.debug(e);
+			return false;
+		}
+		var converterStream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
+							   .createInstance(Components.interfaces.nsIConverterInputStream);
+		converterStream.init(rawStream, "UTF-8", 65535,
+			Components.interfaces.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
+		var str = {};
+		converterStream.readString(channel.contentLength, str);
+		converterStream.close();
+		return str.value;
+	},
 }
 
 Zotero.Cite._monthStrings = false;