From 0821e34b209514b2edf2f87abf9cb124d6ee0066 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 11 May 2010 19:49:22 +0000 Subject: [PATCH] WebDAV server SSL error wasn't being properly displayed --- chrome/content/zotero/xpcom/storage/webdav.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js index 4012bbe049..a243afd988 100644 --- a/chrome/content/zotero/xpcom/storage/webdav.js +++ b/chrome/content/zotero/xpcom/storage/webdav.js @@ -1644,7 +1644,7 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._checkResponse = function (req, obj Zotero.debug(e); } - var msg = Zotero.localeString([ + var msg = Zotero.localeJoin([ Zotero.getString('sync.storage.error.webdav.sslCertificateError'), Zotero.getString('sync.storage.error.webdav.loadURLForMoreInfo') ]); @@ -1653,7 +1653,7 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._checkResponse = function (req, obj return; } else if ((secInfo.securityState & Ci.nsIWebProgressListener.STATE_IS_BROKEN) == Ci.nsIWebProgressListener.STATE_IS_BROKEN) { - var msg = Zotero.localeString([ + var msg = Zotero.localeJoin([ Zotero.getString('sync.storage.error.webdav.sslConnectionError'), Zotero.getString('sync.storage.error.webdav.loadURLForMoreInfo') ]);