suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix localized sorting of creator types

Browse Source 
Don't just rely on "Author" being first
This commit is contained in:
Dan Stillman 2017-11-29 00:28:05 -05:00
parent 76b96a8b07
commit e2eef779c5
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
chrome/content/zotero/xpcom/data/cachedTypes.js
View File

@ -236,11 +236,8 @@ Zotero.CreatorTypes = new function() {
this.init = Zotero.Promise.coroutine(function* () { this.init = Zotero.Promise.coroutine(function* () {
yield this.constructor.prototype.init.apply(this); yield this.constructor.prototype.init.apply(this);
var sql = "SELECT itemTypeID, creatorTypeID AS id, creatorType AS name " var sql = "SELECT itemTypeID, creatorTypeID AS id, creatorType AS name, primaryField "
+ "FROM itemTypeCreatorTypes NATURAL JOIN creatorTypes " + "FROM itemTypeCreatorTypes NATURAL JOIN creatorTypes";
// DEBUG: sort needs to be on localized strings in itemPane.js
// (though still put primary field at top)
+ "ORDER BY primaryField=1 DESC, name";
var rows = yield Zotero.DB.queryAsync(sql); var rows = yield Zotero.DB.queryAsync(sql);
for (let i=0; i<rows.length; i++) { for (let i=0; i<rows.length; i++) {
let row = rows[i]; let row = rows[i];
@ -250,7 +247,20 @@ Zotero.CreatorTypes = new function() {
} }
_creatorTypesByItemType[itemTypeID].push({ _creatorTypesByItemType[itemTypeID].push({
id: row.id, id: row.id,
name: row.name name: row.name,
primaryField: row.primaryField,
localizedName: this.getLocalizedString(row.name)
});
}
// Sort primary field first, then by localized name
for (let itemTypeID in _creatorTypesByItemType) {
_creatorTypesByItemType[itemTypeID].sort((a, b) => {
if (a.primaryField != b.primaryField) return b.primaryField - a.primaryField;
return Zotero.localeCompare(a.localizedName, b.localizedName);
});
_creatorTypesByItemType[itemTypeID].forEach((x) => {
delete x.primaryField;
delete x.localizedName;
}); });
} }