From 8bc56fdeb12620763b7cbd6e8cc46a7fceb593e2 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Mon, 16 Jul 2012 14:43:33 -0400 Subject: [PATCH 1/3] Fix typo --- chrome/content/zotero/xpcom/date.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/date.js b/chrome/content/zotero/xpcom/date.js index ccd7fc362..a38b005f6 100644 --- a/chrome/content/zotero/xpcom/date.js +++ b/chrome/content/zotero/xpcom/date.js @@ -74,7 +74,7 @@ Zotero.Date = new function(){ "short":["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], "long":["January", "February", "March", "April", "May", "June", "July", - "Auguest", "September", "October", "November", "December"]}; + "August", "September", "October", "November", "December"]}; } return _months; From 004e6bbd0ac0c577273e728bd2fcb1e33660c74a Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Tue, 17 Jul 2012 14:01:01 -0400 Subject: [PATCH 2/3] Restore CSL locales checkout to 1.0.1 branch (switched to master by ec391d9346e4a389c9b4c037dc33295dbd953013) --- chrome/content/zotero/locale/csl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl index 74ca6327a..42426e1d7 160000 --- a/chrome/content/zotero/locale/csl +++ b/chrome/content/zotero/locale/csl @@ -1 +1 @@ -Subproject commit 74ca6327aaa9bae30a5454ec49e406a1fd858e30 +Subproject commit 42426e1d786f766144e143894c3829d8f11c285c From ad4eccc54df899ee9437e1d5cdad706cf7416cdd Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Tue, 17 Jul 2012 18:39:23 -0400 Subject: [PATCH 3/3] Don't error on translation via server --- .../content/zotero/tools/testTranslators/translatorTester.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/tools/testTranslators/translatorTester.js b/chrome/content/zotero/tools/testTranslators/translatorTester.js index 60be2262a..605b5a1e3 100644 --- a/chrome/content/zotero/tools/testTranslators/translatorTester.js +++ b/chrome/content/zotero/tools/testTranslators/translatorTester.js @@ -452,7 +452,8 @@ Zotero_TranslatorTester.prototype._runTestTranslate = function(translate, transl if(!translators.length) { testDoneCallback(this, test, "failed", "Detection failed"); return; - } else if(this.type === "web" && (translators[0].itemType !== "multiple" && test.items.length > 1 || + } else if(this.type === "web" && translators[0].itemType !== "server" + && (translators[0].itemType !== "multiple" && test.items.length > 1 || test.items.length === 1 && translators[0].itemType !== test.items[0].itemType)) { // this handles "items":"multiple" too, since the string has length 8 testDoneCallback(this, test, "failed", "Detection returned wrong item type");