commit 7d6bd8d0af6b26a4b8443091e55bba928d33d9cb
parent 0e63958f96d2d3747b53334ffa0da7bf81d17891
Author: Dan Stillman <dstillman@zotero.org>
Date: Thu, 24 Aug 2006 19:43:48 +0000
"project"=>"collection" (already "collection" in most places internally)
Diffstat:
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/chrome/chromeFiles/content/scholar/fileInterface.js b/chrome/chromeFiles/content/scholar/fileInterface.js
@@ -2,10 +2,10 @@ var Scholar_File_Interface = new function() {
var _unresponsiveScriptPreference, _importCollection, _notifyItem, _notifyCollection;
this.exportFile = exportFile;
- this.exportProject = exportProject;
+ this.exportCollection = exportCollection;
this.exportItems = exportItems;
this.importFile = importFile;
- this.bibliographyFromProject = bibliographyFromProject;
+ this.bibliographyFromCollection = bibliographyFromCollection;
this.bibliographyFromItems = bibliographyFromItems;
/*
@@ -43,7 +43,7 @@ var Scholar_File_Interface = new function() {
/*
* exports a collection
*/
- function exportProject() {
+ function exportCollection() {
var collection = ScholarPane.getSelectedCollection();
if(!collection) throw("no collection currently selected");
@@ -181,9 +181,9 @@ var Scholar_File_Interface = new function() {
}
/*
- * Creates a bibliography from a project
+ * Creates a bibliography from a collection
*/
- function bibliographyFromProject() {
+ function bibliographyFromCollection() {
var collection = ScholarPane.getSelectedCollection();
if(!collection) throw("no collection currently selected");
diff --git a/chrome/chromeFiles/content/scholar/ingester/browser.js b/chrome/chromeFiles/content/scholar/ingester/browser.js
@@ -71,7 +71,7 @@ Scholar_Ingester_Interface.scrapeThisPage = function(saveLocation) {
if(saveLocation) {
saveLocation = Scholar.Collections.get(saveLocation);
- } else { // save to currently selected project, if a project is selected
+ } else { // save to currently selected collection, if a collection is selected
try {
saveLocation = ScholarPane.getSelectedCollection();
} catch(e) {}
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -54,8 +54,8 @@
<menuitem label="&toolbar.renameCollection.label;" oncommand="ScholarPane.renameSelectedCollection();"/>
<menuitem label="&toolbar.removeCollection.label;" oncommand="ScholarPane.deleteSelectedCollection();"/>
<menuseparator/>
- <menuitem label="&toolbar.exportCollection.label;" oncommand="Scholar_File_Interface.exportProject();"/>
- <menuitem label="&toolbar.createBibCollection.label;" oncommand="Scholar_File_Interface.bibliographyFromProject();"/>
+ <menuitem label="&toolbar.exportCollection.label;" oncommand="Scholar_File_Interface.exportCollection();"/>
+ <menuitem label="&toolbar.createBibCollection.label;" oncommand="Scholar_File_Interface.bibliographyFromCollection();"/>
</popup>
<popup id="scholar-itemmenu" onpopupshowing="ScholarPane.buildItemContextMenu();">
<menuitem label="&toolbar.newItem.label;" command="cmd_scholar_newItem"/>
diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd b/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd
@@ -20,14 +20,14 @@
<!ENTITY toolbar.newItem.label "New Item">
<!ENTITY toolbar.removeItem.label "Remove Item...">
-<!ENTITY toolbar.newCollection.label "New Project">
+<!ENTITY toolbar.newCollection.label "New Collection">
<!ENTITY toolbar.newSearch.label "New Search">
-<!ENTITY toolbar.renameCollection.label "Rename Project...">
-<!ENTITY toolbar.removeCollection.label "Remove Project...">
-<!ENTITY toolbar.exportCollection.label "Export Project...">
+<!ENTITY toolbar.renameCollection.label "Rename Collection...">
+<!ENTITY toolbar.removeCollection.label "Remove Collection...">
+<!ENTITY toolbar.exportCollection.label "Export Collection...">
<!ENTITY toolbar.import.label "Import...">
<!ENTITY toolbar.export.label "Export Library...">
-<!ENTITY toolbar.createBibCollection.label "Create Bibliography From Project...">
+<!ENTITY toolbar.createBibCollection.label "Create Bibliography From Collection...">
<!ENTITY toolbar.search.label "Search:">
<!ENTITY toolbar.fullscreen.tooltip "Toggle Fullscreen Mode">
<!ENTITY toolbar.openurl.label "Find in your library's catalog">
diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.properties b/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
@@ -1,8 +1,8 @@
-pane.collections.delete = Are you sure you want to delete the selected project?
-pane.collections.delete.multiple = Are you sure you want to delete the selected projects?
-pane.collections.rename = Rename Project:
+pane.collections.delete = Are you sure you want to delete the selected collection?
+pane.collections.delete.multiple = Are you sure you want to delete the selected collections?
+pane.collections.rename = Rename Collection:
pane.collections.library = My Library
-pane.collections.untitled = Untitled Project
+pane.collections.untitled = Untitled Collection
pane.items.delete = Are you sure you want to delete the selected item?
pane.items.delete.multiple = Are you sure you want to delete the selected items?
diff --git a/schema.sql b/schema.sql
@@ -186,7 +186,7 @@
FOREIGN KEY (creatorTypeID) REFERENCES creatorTypes(creatorTypeID)
);
- -- Collections (a.k.a. "projects") for holding items
+ -- Collections for holding items
DROP TABLE IF EXISTS collections;
CREATE TABLE collections (
collectionID INT,
@@ -732,11 +732,11 @@
INSERT INTO "itemNotes" VALUES(16, 1, 'This item is note-worthy.');
INSERT INTO "itemNotes" VALUES(17, NULL, 'This is an independent note.');
- INSERT INTO collections VALUES (1241, 'Test Project', NULL);
- INSERT INTO collections VALUES (3262, 'Another Test Project', NULL);
- INSERT INTO collections VALUES (6856, 'Yet Another Project', NULL);
- INSERT INTO collections VALUES (7373, 'A Sub-project!', 6856);
- INSERT INTO collections VALUES (9233, 'A Sub-sub-project!', 7373);
+ INSERT INTO collections VALUES (1241, 'Test Collection', NULL);
+ INSERT INTO collections VALUES (3262, 'Another Test Collection', NULL);
+ INSERT INTO collections VALUES (6856, 'Yet Another Collection', NULL);
+ INSERT INTO collections VALUES (7373, 'A Sub-collection!', 6856);
+ INSERT INTO collections VALUES (9233, 'A Sub-sub-collection!', 7373);
INSERT INTO collectionItems VALUES (6856, 14, 0);
INSERT INTO collectionItems VALUES (6856, 13, 1);
