diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html index a0180a761a..805b86f66d 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html @@ -1,5 +1,9 @@ - {{ accessStatus | translate }} + + {{ 'listelement.badge.access-status' | translate }} + {{ accessStatus | translate }} + , + diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts index f661ed6e00..9faba30c84 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts +++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts @@ -77,7 +77,7 @@ describe('ItemAccessStatusBadgeComponent', () => { function lookForAccessStatusBadge(status: string) { const badge = fixture.debugElement.query(By.css('span.badge')); - expect(badge.nativeElement.textContent).toEqual(`access-status.${status.toLowerCase()}.listelement.badge`); + expect(badge.nativeElement.textContent).toContain(`access-status.${status.toLowerCase()}.listelement.badge`); } describe('init', () => { diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html index 4cf93cbd1d..be85e8d2f3 100644 --- a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html @@ -1,5 +1,7 @@
+ {{ 'mydspace.status' | translate }} {{('mydspace.status.' + badgeContent) | translate}} + ,
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html index c864f22afa..136a4055e0 100644 --- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html @@ -1,6 +1,10 @@
- {{ "item.badge.private" | translate }} + {{ 'item.badge.status' | translate }} + {{ "item.badge.private" | translate }} + ,
- {{ "item.badge.withdrawn" | translate }} + {{ 'item.badge.status' | translate }} + {{ "item.badge.withdrawn" | translate }} + ,
diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html index 119702c375..a77e6fbba5 100644 --- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html @@ -1,3 +1,7 @@ - {{ typeMessage | translate }} + + {{ 'listelement.badge.dso-type' | translate}} + {{ typeMessage | translate }} + , + diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 6c91bae4c1..a1ebb99057 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -34,6 +34,8 @@ "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator", + "listelement.badge.access-status": "Access status:", + "access-status.embargo.listelement.badge": "Embargo", "access-status.metadata.only.listelement.badge": "Metadata only", @@ -1898,6 +1900,8 @@ "item.edit.authorizations.title": "Edit item's Policies", + "item.badge.status": "Item status:", + "item.badge.private": "Non-discoverable", "item.badge.withdrawn": "Withdrawn", @@ -3012,6 +3016,8 @@ "mydspace.show.supervisedWorkspace": "Supervised items", + "mydspace.status": "My DSpace status:", + "mydspace.status.mydspaceArchived": "Archived", "mydspace.status.mydspaceValidation": "Validation", @@ -3068,6 +3074,8 @@ "nav.user.description": "User profile bar", + "listelement.badge.dso-type": "Item type:", + "none.listelement.badge": "Item", "orgunit.listelement.badge": "Organizational Unit",