mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch '3.0'

Browse source 
Conflicts:
	chrome/content/zotero/locale/csl
This commit is contained in:
Simon Kornblith 2012-07-17 18:40:46 -04:00
commit 263c54d09b
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/locale/csl

@ -1 +1 @@
Subproject commit 6fb3afd3f2f2984172eb96681462b394c17f0d83
Subproject commit 42426e1d786f766144e143894c3829d8f11c285c

3
chrome/content/zotero/tools/testTranslators/translatorTester.js
View file

@ -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");

2
translators

@ -1 +1 @@
Subproject commit 5cfa972fca85a706e6e63767547912ee26b9a982
Subproject commit 6d06650a00e2cbfca371bdf9caa4d45583ab9a16