From 3530545eb9346c548ca5854b233689f5afa36674 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 1 Apr 2023 17:04:39 -0400 Subject: [PATCH] Remove base-only localized strings from `searchConditions` 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. --- chrome/content/zotero/xpcom/data/itemFields.js | 6 ++---- chrome/locale/en-US/zotero/zotero.properties | 4 +--- resource/schema/global | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/itemFields.js b/chrome/content/zotero/xpcom/data/itemFields.js index b0ed5788f4..60380b36cd 100644 --- a/chrome/content/zotero/xpcom/data/itemFields.js +++ b/chrome/content/zotero/xpcom/data/itemFields.js @@ -76,11 +76,9 @@ Zotero.ItemFields = new function() { var baseFields = yield Zotero.DB.columnQueryAsync(sql); for (let field of fields) { - let isBaseField = baseFields.includes(field.fieldID); 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 - // used in the UI and therefore aren't localized - if (!label && !['number', 'type', 'medium'].includes(field.fieldName)) { + // If string not available, use the field name + if (!label) { Zotero.logError(`Localized string not available for field '${field.fieldName}'`); label = Zotero.Utilities.Internal.camelToTitleCase(field.fieldName); } diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 5c0c738204..07398f228d 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -623,8 +623,8 @@ itemFields.identifier = Identifier itemFields.type = Type itemFields.format = Format itemFields.status = Status -itemFields.organization = Organization itemFields.authority = Authority +itemFields.organization = Organization itemFields.feed = Feed creatorTypes.author = Author @@ -845,7 +845,6 @@ searchConditions.tag = Tag searchConditions.note = Note searchConditions.childNote = Child Note searchConditions.creator = Creator -searchConditions.type = Type searchConditions.thesisType = Thesis Type searchConditions.reportType = Report Type searchConditions.videoRecordingFormat = Video Recording Format @@ -856,7 +855,6 @@ searchConditions.interviewMedium = Interview Medium searchConditions.manuscriptType = Manuscript Type searchConditions.presentationType = Presentation Type searchConditions.mapType = Map Type -searchConditions.medium = Medium searchConditions.artworkMedium = Artwork Medium searchConditions.dateModified = Date Modified searchConditions.fulltextContent = Attachment Content diff --git a/resource/schema/global b/resource/schema/global index 045659ea75..d04a141cc7 160000 --- a/resource/schema/global +++ b/resource/schema/global @@ -1 +1 @@ -Subproject commit 045659ea75581e915dd9a0d4c0a1ec48b312a3d5 +Subproject commit d04a141cc7f394909fa3d7ded29c2906c43b10b9