Skip to content

Commit

Permalink
Merge pull request #265 from performant-software/feature/basira256_la…
Browse files Browse the repository at this point in the history
…bels

BASIRA #256 - Labels
  • Loading branch information
dleadbetter authored Nov 29, 2024
2 parents 1947235 + 65597b2 commit 28e1748
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion client/src/components/ActionModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const ActionModal = (props: Props) => (
className='action-description'
size='medium'
>
<div>{ props.t('ActionModal.labels.book') }</div>
<div>{ props.t('ActionModal.labels.document') }</div>
<ValueListDropdown
{...props}
object='Document'
Expand Down
21 changes: 10 additions & 11 deletions client/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"ActionModal": {
"labels": {
"body": "Body descriptors",
"book": "The book",
"descriptors": "Entity descriptors",
"document": "The document",
"notes": "Notes"
},
"title": {
Expand Down Expand Up @@ -188,11 +188,11 @@
},
"Document": {
"actions": {
"book": "The book",
"columns": {
"entity": "Entity",
"verb": "Verb"
}
},
"document": "The document"
},
"labels": {
"action": "The document {{verb}} {{entity}}",
Expand All @@ -202,10 +202,9 @@
"bindingOrnamentation": "Binding Ornamentation",
"bindingRelationshipToTextBlock": "Binding Relationship to Text Block",
"bindingType": "Binding Type",
"bookmarksRegisterColor": "Bookmark/Register Color",
"bookmarksRegisterColor": "Color of Bookmarks/Registers",
"bookmarksRegisters": "Number of Bookmarks/Registers Visible",
"bookmarkRegisterStyle": "Bookmark/Register Style",
"color": "Color",
"colorOfForeEdges": "Color of Textblock Edges",
"decoratedForeEdges": "Decorated Textblock Edges",
"documentFormat": "Document Format",
Expand All @@ -228,7 +227,7 @@
"notes": "Notes",
"numberFastenings": "Number of Fastenings",
"numberSewingSupports": "Number of Sewing Supports Visible",
"orientation": "Orientation",
"orientation": "Orientation of Spine",
"pageContents": "Page Contents",
"rubrication": "Rubrication",
"rubricationColor": "Rubrication Color",
Expand Down Expand Up @@ -353,7 +352,7 @@
"name": "Name",
"nationality": "Nationality",
"type": "Type",
"url": "URL",
"url": "Authorized Vocabulary URL",
"yearOfBirth": "Year of birth",
"yearOfDeath": "Year of death",
"yearsOfActivity": "Years of activity"
Expand Down Expand Up @@ -391,7 +390,7 @@
"notes": "Notes",
"state": "State",
"type": "Type",
"url": "URL"
"url": "Authorized Vocabulary URL"
},
"locations": {
"columns": {
Expand Down Expand Up @@ -455,7 +454,7 @@
"artwork": {
"creators": {
"displayName": "Creator",
"nationality": "Creator Place of Origin"
"nationality": "Creator Origin"
},
"dateRange": "Date",
"materials": "Materials",
Expand All @@ -481,7 +480,7 @@
"bindingOrnamentation": "Binding Ornamentation",
"bindingRelationship": "Binding Relationship to Textblock",
"bindingType": "Binding Type",
"bookmarkRegisterColor": "Color",
"bookmarkRegisterColor": "Color of Bookmarks/Registers",
"bookmarkStyle": "Bookmark/Register Style",
"bookmarksRegisters": "Number of Bookmarks/Registers Visible",
"decoratedForeEdges": "Decorated Textblock Edges",
Expand All @@ -502,7 +501,7 @@
"numberFastenings": "Number of Fastenings",
"numberSewingSupports": "Number of Sewing Supports Visible",
"objectWorkType": "Object Work/Type",
"orientation": "Orientation",
"orientation": "Orientation of Spine",
"pageContents": "Page Contents",
"rubrication": "Rubrication",
"rubricationColor": "Rubrication Color",
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Document.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ const Document = () => {
label: t('Document.labels.bookmarksRegisters')
}, {
name: 'bookmark_register_color',
label: t('Document.labels.color'),
label: t('Document.labels.bookmarksRegisterColor'),
qualification: {
object: 'Document',
group: 'Color',
Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/admin/Document.js
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ const Document = (props: Props) => {
{...props}
formField='bookmark_register_color'
group='Color'
label={props.t('Document.labels.color')}
label={props.t('Document.labels.bookmarksRegisterColor')}
multiple
object='Document'
/>
Expand Down Expand Up @@ -563,7 +563,7 @@ const Document = (props: Props) => {
columns={[{
name: 'book',
label: '',
resolve: () => props.t('Document.actions.book'),
resolve: () => props.t('Document.actions.document'),
sortable: false
}, {
name: 'verb',
Expand Down

0 comments on commit 28e1748

Please sign in to comment.