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

Remove base-only localized strings from searchConditions

Browse source 
Now all included in `itemFields.`

We still use base-only fields as search conditions, and schema.json
consumers might want to do so as well, so it makes sense to include
them.
This commit is contained in:
Dan Stillman 2023-04-01 17:04:39 -04:00
parent 430118f071
commit 3530545eb9
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chrome/content/zotero/xpcom/data/itemFields.js
View file

@ -76,11 +76,9 @@ Zotero.ItemFields = new function() {
var baseFields = yield Zotero.DB.columnQueryAsync(sql); var baseFields = yield Zotero.DB.columnQueryAsync(sql);
for (let field of fields) { for (let field of fields) {
let isBaseField = baseFields.includes(field.fieldID);
let label = field.label || Zotero.Schema.globalSchemaLocale.fields[field.fieldName]; let label = field.label || Zotero.Schema.globalSchemaLocale.fields[field.fieldName];
// If string not available, use the field name, except for some base fields that aren't // If string not available, use the field name
// used in the UI and therefore aren't localized if (!label) {
if (!label && !['number', 'type', 'medium'].includes(field.fieldName)) {
Zotero.logError(`Localized string not available for field '${field.fieldName}'`); Zotero.logError(`Localized string not available for field '${field.fieldName}'`);
label = Zotero.Utilities.Internal.camelToTitleCase(field.fieldName); label = Zotero.Utilities.Internal.camelToTitleCase(field.fieldName);
} }

4
chrome/locale/en-US/zotero/zotero.properties
View file

@ -623,8 +623,8 @@ itemFields.identifier = Identifier
itemFields.type = Type itemFields.type = Type
itemFields.format = Format itemFields.format = Format
itemFields.status = Status itemFields.status = Status
itemFields.organization = Organization
itemFields.authority = Authority itemFields.authority = Authority
itemFields.organization = Organization
itemFields.feed = Feed itemFields.feed = Feed
creatorTypes.author = Author creatorTypes.author = Author
@ -845,7 +845,6 @@ searchConditions.tag = Tag
searchConditions.note = Note searchConditions.note = Note
searchConditions.childNote = Child Note searchConditions.childNote = Child Note
searchConditions.creator = Creator searchConditions.creator = Creator
searchConditions.type = Type
searchConditions.thesisType = Thesis Type searchConditions.thesisType = Thesis Type
searchConditions.reportType = Report Type searchConditions.reportType = Report Type
searchConditions.videoRecordingFormat = Video Recording Format searchConditions.videoRecordingFormat = Video Recording Format
@ -856,7 +855,6 @@ searchConditions.interviewMedium = Interview Medium
searchConditions.manuscriptType = Manuscript Type searchConditions.manuscriptType = Manuscript Type
searchConditions.presentationType = Presentation Type searchConditions.presentationType = Presentation Type
searchConditions.mapType = Map Type searchConditions.mapType = Map Type
searchConditions.medium = Medium
searchConditions.artworkMedium = Artwork Medium searchConditions.artworkMedium = Artwork Medium
searchConditions.dateModified = Date Modified searchConditions.dateModified = Date Modified
searchConditions.fulltextContent = Attachment Content searchConditions.fulltextContent = Attachment Content

2
resource/schema/global

@ -1 +1 @@
Subproject commit 045659ea75581e915dd9a0d4c0a1ec48b312a3d5 Subproject commit d04a141cc7f394909fa3d7ded29c2906c43b10b9