From 25ffb504b4003c1750cf6bdaf5f41cf65e7b8556 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 1 Nov 2007 17:01:18 +0000
Subject: [PATCH] Merging locale fallback fix to 1.0.0 tag

---
 chrome/content/zotero/xpcom/cite.js        | 20 ++++++++++++++++----
 chrome/content/zotero/xpcom/cite_compat.js | 20 ++++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
index 68dcb3a2a..752981eb3 100644
--- a/chrome/content/zotero/xpcom/cite.js
+++ b/chrome/content/zotero/xpcom/cite.js
@@ -1194,9 +1194,15 @@ Zotero.CSL.Global = new function() {
 					createInstance();
 				req.open("GET", prefix + loc + ext, false);
 				req.overrideMimeType("text/plain");
-				req.send(null);
+				var fail = false;
+				try {
+					req.send(null);
+				}
+				catch (e) {
+					fail = true;
+				}
 				
-				if (req.responseText) {
+				if (!fail) {
 					Zotero.CSL.Global._xmlLang = loc;
 					var xml = req.responseText;
 				}
@@ -1209,9 +1215,15 @@ Zotero.CSL.Global = new function() {
 					createInstance();
 				req.open("GET", prefix + loc + ext, false);
 				req.overrideMimeType("text/plain");
-				req.send(null);
+				var fail = false;
+				try {
+					req.send(null);
+				}
+				catch (e) {
+					fail = true;
+				}
 				
-				if (req.responseText) {
+				if (!fail) {
 					Zotero.CSL.Global._xmlLang = loc;
 					var xml = req.responseText;
 				}
diff --git a/chrome/content/zotero/xpcom/cite_compat.js b/chrome/content/zotero/xpcom/cite_compat.js
index e6e192b59..ecadb4045 100644
--- a/chrome/content/zotero/xpcom/cite_compat.js
+++ b/chrome/content/zotero/xpcom/cite_compat.js
@@ -143,9 +143,15 @@ Zotero.CSL.Compat.Global = new function() {
 					createInstance();
 				req.open("GET", prefix + loc + ext, false);
 				req.overrideMimeType("text/plain");
-				req.send(null);
+				var fail = false;
+				try {
+					req.send(null);
+				}
+				catch (e) {
+					fail = true;
+				}
 				
-				if (req.responseText) {
+				if (!fail) {
 					Zotero.CSL.Compat.Global._xmlLang = bibLocale;
 					var xml = req.responseText;
 				}
@@ -158,9 +164,15 @@ Zotero.CSL.Compat.Global = new function() {
 					createInstance();
 				req.open("GET", prefix + loc + ext, false);
 				req.overrideMimeType("text/plain");
-				req.send(null);
+				var fail = false;
+				try {
+					req.send(null);
+				}
+				catch (e) {
+					fail = true;
+				}
 				
-				if (req.responseText) {
+				if (!fail) {
 					Zotero.CSL.Compat.Global._xmlLang = loc;
 					var xml = req.responseText;
 				}