From c8e97783114a3e49708b7174eb04526296407195 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 6 Nov 2012 00:54:19 -0500 Subject: [PATCH 01/11] Update repotime --- repotime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repotime.txt b/repotime.txt index 388815aa0..5f292c820 100644 --- a/repotime.txt +++ b/repotime.txt @@ -1 +1 @@ -2012-07-03 23:35:00 +2012-11-05 20:05:00 From cdd637f3ec2e98ec7bd7e7a14f94cdf277005d4e Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Tue, 6 Nov 2012 00:59:48 -0500 Subject: [PATCH 02/11] Save citation lists instead of multiple item citations --- chrome/content/zotero/fileInterface.js | 13 +++---------- chrome/content/zotero/xpcom/cite.js | 10 +++++++--- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js index 3e53d00c3..6463d3803 100644 --- a/chrome/content/zotero/fileInterface.js +++ b/chrome/content/zotero/fileInterface.js @@ -509,16 +509,9 @@ var Zotero_File_Interface = new function() { return; } else { - if (io.mode == 'citation') { - var csl = Zotero.Styles.get(format).csl; - csl.updateItems([item.id for each(item in items)]); - var citation = {citationItems:[{id:item.id} for each(item in items)], properties:{}}; - var bibliography = csl.previewCitationCluster(citation, [], [], "html"); - } - else { - var style = Zotero.Styles.get(io.style); - var bibliography = Zotero.Cite.makeFormattedBibliographyOrCitationList(style, items, format); - } + var style = Zotero.Styles.get(io.style); + var bibliography = Zotero.Cite.makeFormattedBibliographyOrCitationList(style, + items, format, io.mode === "citation"); } } catch(e) { window.alert(Zotero.getString("fileInterface.bibliographyGenerationError")); diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js index eb2c2a35c..cc5c5c762 100644 --- a/chrome/content/zotero/xpcom/cite.js +++ b/chrome/content/zotero/xpcom/cite.js @@ -191,14 +191,18 @@ Zotero.Cite.getBibliographyFormatParameters = function(bib) { * @param {Zotero.Style} style The style to use * @param {Zotero.Item[]} items An array of items * @param {String} format The format of the output + * @param {Boolean} asCitationList Whether to return a list of formatted citations even if + * the style defines a bibliography */ -Zotero.Cite.makeFormattedBibliographyOrCitationList = function(style, items, format) { +Zotero.Cite.makeFormattedBibliographyOrCitationList = function(style, items, format, asCitationList) { var cslEngine = style.csl; cslEngine.setOutputFormat(format); cslEngine.updateItems([item.id for each(item in items)]); - var bibliography = Zotero.Cite.makeFormattedBibliography(cslEngine, format); - if(bibliography) return bibliography; + if(!asCitationList) { + var bibliography = Zotero.Cite.makeFormattedBibliography(cslEngine, format); + if(bibliography) return bibliography; + } var styleClass = style.class; var citations = [cslEngine.appendCitationCluster({"citationItems":[{"id":item.id}], "properties":{}}, true)[0][1] From 6220bc39f5b4fb4017b9f4d21f66f394759e2dc8 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 6 Nov 2012 01:16:03 -0500 Subject: [PATCH 03/11] "Citations"/"Notes" instead of "Citation"/"Note" in right-click dialog --- chrome/content/zotero/bibliography.js | 8 ++++---- chrome/content/zotero/bibliography.xul | 2 +- chrome/locale/af-ZA/zotero/zotero.properties | 4 ++-- chrome/locale/ar/zotero/zotero.properties | 4 ++-- chrome/locale/bg-BG/zotero/zotero.properties | 4 ++-- chrome/locale/ca-AD/zotero/zotero.properties | 4 ++-- chrome/locale/cs-CZ/zotero/zotero.properties | 4 ++-- chrome/locale/da-DK/zotero/zotero.properties | 4 ++-- chrome/locale/de/zotero/zotero.properties | 4 ++-- chrome/locale/el-GR/zotero/zotero.properties | 4 ++-- chrome/locale/en-US/zotero/zotero.properties | 4 ++-- chrome/locale/es-ES/zotero/zotero.properties | 4 ++-- chrome/locale/et-EE/zotero/zotero.properties | 4 ++-- chrome/locale/eu-ES/zotero/zotero.properties | 4 ++-- chrome/locale/fa/zotero/zotero.properties | 4 ++-- chrome/locale/fi-FI/zotero/zotero.properties | 4 ++-- chrome/locale/fr-FR/zotero/zotero.properties | 4 ++-- chrome/locale/gl-ES/zotero/zotero.properties | 4 ++-- chrome/locale/he-IL/zotero/zotero.properties | 4 ++-- chrome/locale/hr-HR/zotero/zotero.properties | 4 ++-- chrome/locale/hu-HU/zotero/zotero.properties | 4 ++-- chrome/locale/is-IS/zotero/zotero.properties | 4 ++-- chrome/locale/it-IT/zotero/zotero.properties | 4 ++-- chrome/locale/ja-JP/zotero/zotero.properties | 4 ++-- chrome/locale/km/zotero/zotero.properties | 4 ++-- chrome/locale/ko-KR/zotero/zotero.properties | 4 ++-- chrome/locale/mn-MN/zotero/zotero.properties | 4 ++-- chrome/locale/nb-NO/zotero/zotero.properties | 4 ++-- chrome/locale/nl-NL/zotero/zotero.properties | 4 ++-- chrome/locale/nn-NO/zotero/zotero.properties | 4 ++-- chrome/locale/pl-PL/zotero/zotero.properties | 4 ++-- chrome/locale/pt-BR/zotero/zotero.properties | 4 ++-- chrome/locale/pt-PT/zotero/zotero.properties | 4 ++-- chrome/locale/ro-RO/zotero/zotero.properties | 4 ++-- chrome/locale/ru-RU/zotero/zotero.properties | 4 ++-- chrome/locale/sk-SK/zotero/zotero.properties | 4 ++-- chrome/locale/sl-SI/zotero/zotero.properties | 4 ++-- chrome/locale/sr-RS/zotero/zotero.properties | 4 ++-- chrome/locale/sv-SE/zotero/zotero.properties | 4 ++-- chrome/locale/th-TH/zotero/zotero.properties | 4 ++-- chrome/locale/tr-TR/zotero/zotero.properties | 4 ++-- chrome/locale/vi-VN/zotero/zotero.properties | 4 ++-- chrome/locale/zh-CN/zotero/zotero.properties | 4 ++-- chrome/locale/zh-TW/zotero/zotero.properties | 4 ++-- 44 files changed, 89 insertions(+), 89 deletions(-) diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js index 93f668374..76c08d09d 100644 --- a/chrome/content/zotero/bibliography.js +++ b/chrome/content/zotero/bibliography.js @@ -176,13 +176,13 @@ var Zotero_File_Interface_Bibliography = new function() { // // Change label to "Citation" or "Note" depending on style class - if(document.getElementById("citation")) { + if(document.getElementById("citations")) { if(Zotero.Styles.get(selectedStyle).class == "note") { - var label = Zotero.getString('citation.note'); + var label = Zotero.getString('citation.notes'); } else { - var label = Zotero.getString('citation.citation'); + var label = Zotero.getString('citation.citations'); } - document.getElementById("citation").label = label; + document.getElementById("citations").label = label; } } diff --git a/chrome/content/zotero/bibliography.xul b/chrome/content/zotero/bibliography.xul index 660ea13cf..32a91c2e5 100644 --- a/chrome/content/zotero/bibliography.xul +++ b/chrome/content/zotero/bibliography.xul @@ -19,7 +19,7 @@ - + diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties index 26c1bfe6e..e6bb7b2ea 100644 --- a/chrome/locale/af-ZA/zotero/zotero.properties +++ b/chrome/locale/af-ZA/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Multiple Sources... citation.singleSource=Single Source... citation.showEditor=Show Editor... citation.hideEditor=Hide Editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero Report report.parentItem=Parent Item: diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties index fd2db5410..c7abf9b15 100644 --- a/chrome/locale/ar/zotero/zotero.properties +++ b/chrome/locale/ar/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=مصادر متعددة... citation.singleSource=مصدر واحد... citation.showEditor=عرض المحرر... citation.hideEditor=إخفاء المحرر... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=تقرير زوتيرو report.parentItem=عنصر رئيسي: diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties index e0a7010cc..85d652c57 100644 --- a/chrome/locale/bg-BG/zotero/zotero.properties +++ b/chrome/locale/bg-BG/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Много източници... citation.singleSource=Един източник... citation.showEditor=Показва редактора... citation.hideEditor=Скрива редактора... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Зотеро отчет report.parentItem=Родителски запис: diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties index 90dfd82aa..2a27f3103 100644 --- a/chrome/locale/ca-AD/zotero/zotero.properties +++ b/chrome/locale/ca-AD/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Múltiples fonts... citation.singleSource=Única font... citation.showEditor=Mostra editor... citation.hideEditor=Oculta editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Informe de Zotero report.parentItem=Element pare: diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties index be8398128..224ec1b9d 100644 --- a/chrome/locale/cs-CZ/zotero/zotero.properties +++ b/chrome/locale/cs-CZ/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Více zdrojů... citation.singleSource=Jednotlivý zdroj... citation.showEditor=Zobrazit editor... citation.hideEditor=Skrýt editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero report report.parentItem=Rodičovská položka: diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties index a81eff1de..7c11e7c5f 100644 --- a/chrome/locale/da-DK/zotero/zotero.properties +++ b/chrome/locale/da-DK/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Flere kilder... citation.singleSource=En enkelt kilde... citation.showEditor=Vis Editor... citation.hideEditor=Skjul Editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero-rapport report.parentItem=Overordnet Element diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties index 26f7a65f7..626227abc 100644 --- a/chrome/locale/de/zotero/zotero.properties +++ b/chrome/locale/de/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Mehrere Quellen... citation.singleSource=Einzelne Quelle... citation.showEditor=Editor anzeigen... citation.hideEditor=Editor verbergen... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero-Bericht report.parentItem=Übergeordneter Eintrag: diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties index 26c1bfe6e..e6bb7b2ea 100644 --- a/chrome/locale/el-GR/zotero/zotero.properties +++ b/chrome/locale/el-GR/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Multiple Sources... citation.singleSource=Single Source... citation.showEditor=Show Editor... citation.hideEditor=Hide Editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero Report report.parentItem=Parent Item: diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 3d0eb16bd..1a561b48b 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources = Multiple Sources… citation.singleSource = Single Source… citation.showEditor = Show Editor… citation.hideEditor = Hide Editor… -citation.citation = Citation -citation.note = Note +citation.citations = Citations +citation.notes = Notes report.title.default = Zotero Report report.parentItem = Parent Item: diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties index a0b087818..5643703e3 100644 --- a/chrome/locale/es-ES/zotero/zotero.properties +++ b/chrome/locale/es-ES/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Fuentes múltiples... citation.singleSource=Fuente única... citation.showEditor=Mostrar editor... citation.hideEditor=Ocultar editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Informe de Zotero report.parentItem=Ítem contenedor: diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties index 24eecfddf..a32c4c404 100644 --- a/chrome/locale/et-EE/zotero/zotero.properties +++ b/chrome/locale/et-EE/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Mitmed allikad... citation.singleSource=Üks allikas... citation.showEditor=Toimetaja näidata... citation.hideEditor=Toimetaja peita... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero raport report.parentItem=Ülemkirje: diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties index 89c102ff3..fbafb387e 100644 --- a/chrome/locale/eu-ES/zotero/zotero.properties +++ b/chrome/locale/eu-ES/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Iturri ugariak... citation.singleSource=Iturri bakarra... citation.showEditor=Erakutsi Editorea... citation.hideEditor=Ezkutatu Editorea... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero Txostena report.parentItem=Item Gurasoa: diff --git a/chrome/locale/fa/zotero/zotero.properties b/chrome/locale/fa/zotero/zotero.properties index ab90eaeee..d9a252ed4 100644 --- a/chrome/locale/fa/zotero/zotero.properties +++ b/chrome/locale/fa/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=چند مرجع ... citation.singleSource=یک مرجع ... citation.showEditor=نمایش ویرایشگر... citation.hideEditor=نهفتن ویرایشگر ... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=گزارش زوترو report.parentItem=آیتم‌ مادر: diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties index 9fce420f7..b49b87f60 100644 --- a/chrome/locale/fi-FI/zotero/zotero.properties +++ b/chrome/locale/fi-FI/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Multiple Sources... citation.singleSource=Single Source... citation.showEditor=Show Editor... citation.hideEditor=Hide Editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero-raportti report.parentItem=Ylänimike: diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties index b5cf5d95d..62ba74bf4 100644 --- a/chrome/locale/fr-FR/zotero/zotero.properties +++ b/chrome/locale/fr-FR/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Sources multiples… citation.singleSource=Source unique… citation.showEditor=Montrer l'éditeur… citation.hideEditor=Cacher l'éditeur… -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Rapport Zotero report.parentItem=Document parent : diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties index a6794aac2..6c95664ba 100644 --- a/chrome/locale/gl-ES/zotero/zotero.properties +++ b/chrome/locale/gl-ES/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Multiples Fontes... citation.singleSource=Fonte Única.... citation.showEditor=Mostrar Editor citation.hideEditor=Agochar Editor -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Informe Zotero report.parentItem=Artigo Pai: diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties index 98325ddb7..4482c902b 100644 --- a/chrome/locale/he-IL/zotero/zotero.properties +++ b/chrome/locale/he-IL/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Multiple Sources... citation.singleSource=מקור בודד... citation.showEditor=הצג עורך... citation.hideEditor=הסתר עורך... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero Report report.parentItem=Parent Item: diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties index 26c1bfe6e..e6bb7b2ea 100644 --- a/chrome/locale/hr-HR/zotero/zotero.properties +++ b/chrome/locale/hr-HR/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Multiple Sources... citation.singleSource=Single Source... citation.showEditor=Show Editor... citation.hideEditor=Hide Editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero Report report.parentItem=Parent Item: diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties index 460db6e5c..cc6657411 100644 --- a/chrome/locale/hu-HU/zotero/zotero.properties +++ b/chrome/locale/hu-HU/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Több forrás... citation.singleSource=Egy forrás... citation.showEditor=Szerkesztő megjelenítése... citation.hideEditor=Szerkesztő elrejtése... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero jelentés report.parentItem=Szülő elem: diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties index fe629139a..40b01afed 100644 --- a/chrome/locale/is-IS/zotero/zotero.properties +++ b/chrome/locale/is-IS/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Multiple Sources... citation.singleSource=Single Source... citation.showEditor=Show Editor... citation.hideEditor=Hide Editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero skýrsla report.parentItem=Parent Item: diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties index daab96c7b..ddd714c8e 100644 --- a/chrome/locale/it-IT/zotero/zotero.properties +++ b/chrome/locale/it-IT/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Fonti multiple... citation.singleSource=Fonte singola... citation.showEditor=Visualizza editor... citation.hideEditor=Nascondi editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Rapporto Zotero report.parentItem=Elemento principale: diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties index 04fcf0644..e85cb74ea 100644 --- a/chrome/locale/ja-JP/zotero/zotero.properties +++ b/chrome/locale/ja-JP/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=複数の参照データ... citation.singleSource=単一の参照データ... citation.showEditor=編集者名を表示する... citation.hideEditor=編集者名を表示しない... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero レポート report.parentItem=親アイテム: diff --git a/chrome/locale/km/zotero/zotero.properties b/chrome/locale/km/zotero/zotero.properties index 6321a2126..6dbce5e9e 100644 --- a/chrome/locale/km/zotero/zotero.properties +++ b/chrome/locale/km/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=ពហុប្រភព... citation.singleSource=ឯកប្រភព... citation.showEditor=បង្ហាញកំណែតម្រូវ... citation.hideEditor=លាក់កំណែតម្រូវ... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=របាយការណ៍ហ្ស៊ូតេរ៉ូ report.parentItem=តត្តកម្មៈ diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties index e10e35b7a..4e6bb3d22 100644 --- a/chrome/locale/ko-KR/zotero/zotero.properties +++ b/chrome/locale/ko-KR/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=복수의 출처... citation.singleSource=단일 출처... citation.showEditor=편집기 표시... citation.hideEditor=편집기 감추기... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero 보고서 report.parentItem=근원 항목: diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties index 86c7cbd41..6ea25cd5b 100644 --- a/chrome/locale/mn-MN/zotero/zotero.properties +++ b/chrome/locale/mn-MN/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Multiple Sources... citation.singleSource=Single Source... citation.showEditor=Show Editor... citation.hideEditor=Hide Editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero Report report.parentItem=Parent Item: diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties index a8a00bf5b..9cefcc221 100644 --- a/chrome/locale/nb-NO/zotero/zotero.properties +++ b/chrome/locale/nb-NO/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Flere kilder... citation.singleSource=Enkeltkilde... citation.showEditor=Vis behandler... citation.hideEditor=Skjul behandler... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero-rapport report.parentItem=Overordnet element: diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties index 9da4d6f03..3342793de 100644 --- a/chrome/locale/nl-NL/zotero/zotero.properties +++ b/chrome/locale/nl-NL/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Meerdere bronnen… citation.singleSource=Enkele bron… citation.showEditor=Editor tonen… citation.hideEditor=Editor verbergen… -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero-rapport report.parentItem=Moederobject: diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties index f46ea4b63..e343f1a11 100644 --- a/chrome/locale/nn-NO/zotero/zotero.properties +++ b/chrome/locale/nn-NO/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Fleire kjelder.. … citation.singleSource=Enkeltkjelde … citation.showEditor=Vis handsamar … citation.hideEditor=Skjul handsamar … -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero-rapport report.parentItem=Overordna element: diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties index ba0de67d5..1d5f35b77 100644 --- a/chrome/locale/pl-PL/zotero/zotero.properties +++ b/chrome/locale/pl-PL/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Wiele źródeł citation.singleSource=Pojedyncze źródło citation.showEditor=Wyświetl redaktora citation.hideEditor=Ukryj redaktora -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Raport Zotero report.parentItem=Element nadrzędny: diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties index c51bbefab..a751c9ad2 100644 --- a/chrome/locale/pt-BR/zotero/zotero.properties +++ b/chrome/locale/pt-BR/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Fontes múltiplas... citation.singleSource=Fonte única... citation.showEditor=Mostrar editor... citation.hideEditor=Esconder editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Relatório Zotero report.parentItem=Item no nível acima: diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties index 0f0788ab6..cdd6e871d 100644 --- a/chrome/locale/pt-PT/zotero/zotero.properties +++ b/chrome/locale/pt-PT/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Fontes Múltiplas... citation.singleSource=Fonte Única... citation.showEditor=Mostrar Editor... citation.hideEditor=Esconder Editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Relatório Zotero report.parentItem=Item Pai: diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties index f6062d91c..527564b82 100644 --- a/chrome/locale/ro-RO/zotero/zotero.properties +++ b/chrome/locale/ro-RO/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Surse multiple... citation.singleSource=O singură sursă... citation.showEditor=Afișează editor... citation.hideEditor=Ascunde editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Raport Zotero report.parentItem=Înregistrare părinte: diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties index becc81475..847c6d560 100644 --- a/chrome/locale/ru-RU/zotero/zotero.properties +++ b/chrome/locale/ru-RU/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Много источников… citation.singleSource=Один источник… citation.showEditor=Показать редактор… citation.hideEditor=Спрятать редактор… -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Отчет Zotero report.parentItem=Родительский документ: diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties index 3ffd88cd5..0ac43c2ea 100644 --- a/chrome/locale/sk-SK/zotero/zotero.properties +++ b/chrome/locale/sk-SK/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Viaceré zdroje... citation.singleSource=Jeden zdroj... citation.showEditor=Zobraziť editor... citation.hideEditor=Skryť editor... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Hlásenie Zotera report.parentItem=Nadradená položka: diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties index 813c770e7..d14a8e72f 100644 --- a/chrome/locale/sl-SI/zotero/zotero.properties +++ b/chrome/locale/sl-SI/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Več virov ... citation.singleSource=En vir ... citation.showEditor=Pokaži urejevalnik ... citation.hideEditor=Skrij urejevalnik ... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Poročilo Zotero report.parentItem=Starševski vnos: diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties index e6c302a3a..e14b5bab7 100644 --- a/chrome/locale/sr-RS/zotero/zotero.properties +++ b/chrome/locale/sr-RS/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Вишеструки извори... citation.singleSource=Један извор... citation.showEditor=Прикажи уређивач... citation.hideEditor=Сакриј уређивач... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Зотеро извештај report.parentItem=Родитељски предмет: diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties index b1c2e2a2f..5722113d7 100644 --- a/chrome/locale/sv-SE/zotero/zotero.properties +++ b/chrome/locale/sv-SE/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Flera källor... citation.singleSource=En källa... citation.showEditor=Visa redigeraren... citation.hideEditor=Göm redigeraren... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero-rapport report.parentItem=Överordnad källa: diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties index 39a322c21..fdfb33f3f 100644 --- a/chrome/locale/th-TH/zotero/zotero.properties +++ b/chrome/locale/th-TH/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Multiple Sources... citation.singleSource=Single Source... citation.showEditor=แสดงโปรแกรมจัดการข้อมูล... citation.hideEditor=ซ่อนโปรแกรมจัดการข้อมูล... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=รายงานของ Zotero report.parentItem=รายการแม่: diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties index 08ef36260..2a2745858 100644 --- a/chrome/locale/tr-TR/zotero/zotero.properties +++ b/chrome/locale/tr-TR/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Çoklu Kaynaklar... citation.singleSource=Tek Kaynak... citation.showEditor=Editörü Göster... citation.hideEditor=Editörü Gizle... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero Rapor report.parentItem=Üst Eser: diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties index fb8cefadb..328e0996c 100644 --- a/chrome/locale/vi-VN/zotero/zotero.properties +++ b/chrome/locale/vi-VN/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=Nhiều Tài liệu nguồn... citation.singleSource=Một Tài liệu nguồn... citation.showEditor=Hiện Cửa sổ Soạn Thảo... citation.hideEditor=Dấu Cửa sổ Soạn thảo... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Báo cáo Zotero report.parentItem=Biểu ghi Mẹ: diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties index 1673dd94b..c860f0617 100644 --- a/chrome/locale/zh-CN/zotero/zotero.properties +++ b/chrome/locale/zh-CN/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=多重来源... citation.singleSource=单一来源... citation.showEditor=显示编辑(Editor)... citation.hideEditor=隐藏编辑(Editor)... -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero 报告 report.parentItem=父项: diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties index cc60ab700..357a59b7a 100644 --- a/chrome/locale/zh-TW/zotero/zotero.properties +++ b/chrome/locale/zh-TW/zotero/zotero.properties @@ -567,8 +567,8 @@ citation.multipleSources=多重來源… citation.singleSource=單一來源… citation.showEditor=顯示編輯器… citation.hideEditor=隱藏編輯器… -citation.citation=Citation -citation.note=Note +citation.citations=Citations +citation.notes=Notes report.title.default=Zotero 報告 report.parentItem=母項目： From 4b72792f595af6fb2f5ebfb644c117e7b26636b6 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 6 Nov 2012 01:25:46 -0500 Subject: [PATCH 04/11] Update submodules --- styles | 2 +- translators | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/styles b/styles index 1e8b58267..e1a7be8e3 160000 --- a/styles +++ b/styles @@ -1 +1 @@ -Subproject commit 1e8b58267ae7e6025e2f3bd5c0d55f73a37f30f3 +Subproject commit e1a7be8e32bfb94aa4f408a76e3e45b964ae5283 diff --git a/translators b/translators index a685b279c..1eb8d3724 160000 --- a/translators +++ b/translators @@ -1 +1 @@ -Subproject commit a685b279c61b5c1b1368ea7997fc2b4914eedf8a +Subproject commit 1eb8d372470a40edff40bcfd6e424ab910c3773f From 39c1024461b67965a79005ec8f2903f806fad639 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Tue, 6 Nov 2012 01:35:15 -0500 Subject: [PATCH 05/11] Copy citation list to clipboard, instead of multiple item citation --- chrome/content/zotero/fileInterface.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js index 6463d3803..50ac1019b 100644 --- a/chrome/content/zotero/fileInterface.js +++ b/chrome/content/zotero/fileInterface.js @@ -400,7 +400,7 @@ var Zotero_File_Interface = new function() { * * Does not check that items are actual references (and not notes or attachments) */ - function copyItemsToClipboard(items, style, asHTML) { + function copyItemsToClipboard(items, style, asHTML, asCitations) { // copy to clipboard var transferable = Components.classes["@mozilla.org/widget/transferable;1"]. createInstance(Components.interfaces.nsITransferable); @@ -409,7 +409,7 @@ var Zotero_File_Interface = new function() { var style = Zotero.Styles.get(style); // add HTML - var bibliography = Zotero.Cite.makeFormattedBibliographyOrCitationList(style, items, "html"); + var bibliography = Zotero.Cite.makeFormattedBibliographyOrCitationList(style, items, "html", asCitations); var str = Components.classes["@mozilla.org/supports-string;1"]. createInstance(Components.interfaces.nsISupportsString); str.data = bibliography; @@ -418,7 +418,7 @@ var Zotero_File_Interface = new function() { // add text (or HTML source) if(!asHTML) { - var bibliography = Zotero.Cite.makeFormattedBibliographyOrCitationList(style, items, "text"); + var bibliography = Zotero.Cite.makeFormattedBibliographyOrCitationList(style, items, "text", asCitations); } var str = Components.classes["@mozilla.org/supports-string;1"]. createInstance(Components.interfaces.nsISupportsString); @@ -500,13 +500,7 @@ var Zotero_File_Interface = new function() { // generate bibliography try { if(io.method == 'copy-to-clipboard') { - if (io.mode == 'citation') { - copyCitationToClipboard(items, io.style); - } - else { - copyItemsToClipboard(items, io.style); - } - return; + copyItemsToClipboard(items, io.style, false, io.mode === "citation"); } else { var style = Zotero.Styles.get(io.style); From 5305f37ab4187bcfc9dcb1de735183032ff63f5b Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Tue, 6 Nov 2012 02:51:34 -0500 Subject: [PATCH 06/11] Tweaks to processDocuments --- chrome/content/zotero/xpcom/http.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js index d766f9ff2..6161cd1bc 100644 --- a/chrome/content/zotero/xpcom/http.js +++ b/chrome/content/zotero/xpcom/http.js @@ -512,10 +512,9 @@ Zotero.HTTP = new function() { exception(e); return; } else { + if(!dontDelete) Zotero.Browser.deleteHiddenBrowser(hiddenBrowsers); throw(e); } - } finally { - doLoad(); } } else { if(!dontDelete) Zotero.Browser.deleteHiddenBrowser(hiddenBrowsers); @@ -530,8 +529,8 @@ Zotero.HTTP = new function() { var onLoad = function(e) { var hiddenBrowser = e.currentTarget, doc = hiddenBrowser.contentDocument; - if(!doc || doc !== e.target) return; - var url = doc.location.href.toString(); + if(!doc) return; + var url = doc.documentURI; if(url === "about:blank") return; if(doc.readyState === "loading" && (firedLoadEvent++) < 120) { // Try again in a second From 698e70fb793c19bbd8cef0212f6c2269cb037820 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 6 Nov 2012 13:09:37 -0500 Subject: [PATCH 07/11] Fix Edit menu label in fr-FR locale --- chrome/locale/fr-FR/zotero/standalone.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/locale/fr-FR/zotero/standalone.dtd b/chrome/locale/fr-FR/zotero/standalone.dtd index 9c508dce8..fe21d02a3 100644 --- a/chrome/locale/fr-FR/zotero/standalone.dtd +++ b/chrome/locale/fr-FR/zotero/standalone.dtd @@ -29,7 +29,7 @@ - + From b3ab9a96dcb7e35b5cd58d593049fc5b8aa1d3ae Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Wed, 7 Nov 2012 12:55:13 -0500 Subject: [PATCH 08/11] Tweak to processDocuments --- chrome/content/zotero/xpcom/http.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js index 6161cd1bc..28fc5b559 100644 --- a/chrome/content/zotero/xpcom/http.js +++ b/chrome/content/zotero/xpcom/http.js @@ -534,7 +534,7 @@ Zotero.HTTP = new function() { if(url === "about:blank") return; if(doc.readyState === "loading" && (firedLoadEvent++) < 120) { // Try again in a second - Zotero.setTimeout(onLoad.bind(this, e), 1000); + Zotero.setTimeout(onLoad.bind(this, {"currentTarget":hiddenBrowser}), 1000); return; } From 3c52b422fa2c658a46efcdfe429030b0c1b378ca Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Wed, 7 Nov 2012 15:15:56 -0500 Subject: [PATCH 09/11] Fix missing parens --- chrome/content/zotero/xpcom/zotero.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index e0870ecfd..e61fd78a7 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -2429,7 +2429,7 @@ Zotero.Browser = new function() { } function deleteHiddenBrowser(myBrowsers) { - if(!myBrowsers instanceof Array) myBrowsers = [myBrowsers]; + if(!(myBrowsers instanceof Array)) myBrowsers = [myBrowsers]; for(var i=0; i Date: Wed, 7 Nov 2012 17:17:16 -0500 Subject: [PATCH 10/11] Use global counter for hidden browsers --- chrome/content/zotero/xpcom/zotero.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index e61fd78a7..6cfb909c3 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -2396,6 +2396,8 @@ Zotero.DragDrop = { * Functions for creating and destroying hidden browser objects **/ Zotero.Browser = new function() { + var nBrowsers = 0; + this.createHiddenBrowser = createHiddenBrowser; this.deleteHiddenBrowser = deleteHiddenBrowser; @@ -2423,8 +2425,7 @@ Zotero.Browser = new function() { hiddenBrowser.docShell.allowJavascript = true; hiddenBrowser.docShell.allowMetaRedirects = false; hiddenBrowser.docShell.allowPlugins = false; - Zotero.debug("Created hidden browser (" - + (win.document.getElementsByTagName('browser').length - 1) + ")"); + Zotero.debug("Created hidden browser (" + (nBrowsers++) + ")"); return hiddenBrowser; } @@ -2436,8 +2437,7 @@ Zotero.Browser = new function() { myBrowser.destroy(); myBrowser.parentNode.removeChild(myBrowser); myBrowser = null; - Zotero.debug("Deleted hidden browser (" - + (win.document.getElementsByTagName('browser').length - 1) + ")"); + Zotero.debug("Deleted hidden browser (" + (--nBrowsers) + ")"); } } } From 6b66dbfafaee067bd0e78ee6b804924d8fa04fad Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Wed, 7 Nov 2012 23:52:30 -0500 Subject: [PATCH 11/11] Another tweak to processDocuments --- chrome/content/zotero/xpcom/http.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js index 28fc5b559..328386ece 100644 --- a/chrome/content/zotero/xpcom/http.js +++ b/chrome/content/zotero/xpcom/http.js @@ -492,7 +492,8 @@ Zotero.HTTP = new function() { // (Approximately) how many seconds to wait if the document is left in the loading state and // pageshow is called before we call pageshow with an incomplete document const LOADING_STATE_TIMEOUT = 120; - var firedLoadEvent = 0; + var firedLoadEvent = 0, + loaded = false; /** * Loads the next page @@ -503,6 +504,7 @@ Zotero.HTTP = new function() { var url = urls[currentURL], hiddenBrowser = hiddenBrowsers[currentURL]; firedLoadEvent = 0; + loaded = false; currentURL++; try { Zotero.debug("Zotero.HTTP.processDocuments: Loading "+url); @@ -527,6 +529,7 @@ Zotero.HTTP = new function() { * @inner */ var onLoad = function(e) { + if(loaded) return; var hiddenBrowser = e.currentTarget, doc = hiddenBrowser.contentDocument; if(!doc) return; @@ -540,6 +543,7 @@ Zotero.HTTP = new function() { Zotero.debug("Zotero.HTTP.processDocuments: "+url+" loaded"); hiddenBrowser.removeEventListener("pageshow", onLoad, true); + loaded = true; try { processor(doc);