Merge branch 'w2p-118157_entity-label-fix_contribute-7.6' into w2p-11…

…8157_entity-label-fix_contribute-main # Conflicts: # src/app/item-page/simple/item-types/publication/publication.component.html # src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html # src/assets/i18n/ar.json5
DSpace · Sep 25, 2024 · b005a1c · b005a1c
2 parents 15ceb41 + 27eeefa
commit b005a1c
Show file tree

Hide file tree

Showing 37 changed files with 819 additions and 64 deletions.
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -34,13 +34,13 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isJournalVolumeOfIssue'"
-      [label]="'relationships.isSingleVolumeOf' | translate">
+      [label]="'item.page.journal-volume' | translate">
     </ds-related-items>
     <ds-related-items
       class="mb-1 mt-1"
       [parentItem]="object"
       [relationType]="'isPublicationOfJournalIssue'"
-      [label]="'relationships.isPublicationOfJournalIssue' | translate">
+      [label]="'item.page.articles' | translate">
     </ds-related-items>
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.description']"

diff --git a/...pp/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/...pp/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -22,12 +22,12 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isJournalOfVolume'"
-      [label]="'relationships.isSingleJournalOf' | translate">
+      [label]="'item.page.journal' | translate">
     </ds-related-items>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isIssueOfJournalVolume'"
-      [label]="'relationships.isIssueOf' | translate">
+      [label]="'item.page.journal-issues' | translate">
     </ds-related-items>
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.description']"

diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -26,7 +26,7 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isVolumeOfJournal'"
-      [label]="'relationships.isVolumeOf' | translate">
+      [label]="'item.page.journal-volumes' | translate">
     </ds-related-items>
     <ds-generic-item-page-field class="item-page-fields" [item]="object"
       [fields]="['dc.description']"

diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -47,7 +47,7 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isPublicationOfOrgUnit'"
-      [label]="'relationships.isPublicationOf' | translate">
+      [label]="'item.page.publications' | translate">
     </ds-related-items>
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.description']"

diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -26,12 +26,12 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isProjectOfPerson'"
-      [label]="'relationships.isProjectOf' | translate">
+      [label]="'item.page.projects' | translate">
     </ds-related-items>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isOrgUnitOfPerson'"
-      [label]="'relationships.isOrgUnitOf' | translate">
+      [label]="'item.page.org-units' | translate">
     </ds-related-items>
     <ds-generic-item-page-field [item]="object"
       [fields]="['person.jobTitle']"

diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -41,17 +41,17 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isPersonOfProject'"
-      [label]="'relationships.isPersonOf' | translate">
+      [label]="'item.page.authors' | translate">
     </ds-related-items>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isPublicationOfProject'"
-      [label]="'relationships.isPublicationOf' | translate">
+      [label]="'item.page.publications' | translate">
     </ds-related-items>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isOrgUnitOfProject'"
-      [label]="'relationships.isOrgUnitOf' | translate">
+      [label]="'item.page.org-units' | translate">
     </ds-related-items>
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.description']"

diff --git a/...em-page/simple/field-components/specific-field/author/item-page-author-field.component.ts b/...em-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
@@ -50,6 +50,6 @@ export class ItemPageAuthorFieldComponent extends ItemPageFieldComponent {
   /**
    * Label i18n key for the rendered metadata
    */
-  label = 'item.page.author';
+  label = 'item.page.authors';
 
 }
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -29,7 +29,7 @@
       [parentItem]="object"
       [itemType]="'Person'"
       [metadataFields]="['dc.contributor.author', 'dc.creator']"
-      [label]="'relationships.isAuthorOf' | translate">
+      [label]="'item.page.authors' | translate">
     </ds-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"
       [fields]="['journal.title']"
@@ -52,17 +52,17 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isProjectOfPublication'"
-      [label]="'relationships.isProjectOf' | translate">
+      [label]="'item.page.projects' | translate">
     </ds-related-items>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isOrgUnitOfPublication'"
-      [label]="'relationships.isOrgUnitOf' | translate">
+      [label]="'item.page.org-units' | translate">
     </ds-related-items>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isJournalIssueOfPublication'"
-      [label]="'relationships.isJournalIssueOf' | translate">
+      [label]="'item.page.journal-issue' | translate">
     </ds-related-items>
     <ds-item-page-abstract-field [item]="object"></ds-item-page-abstract-field>
     <ds-generic-item-page-field [item]="object"

diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -30,7 +30,7 @@
       [parentItem]="object"
       [itemType]="'Person'"
       [metadataFields]="['dc.contributor.author', 'dc.creator']"
-      [label]="'relationships.isAuthorOf' | translate">
+      [label]="'item.page.authors' | translate">
     </ds-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"
       [fields]="['journal.title']"

diff --git a/...il/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html b/...il/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
@@ -30,7 +30,7 @@
                                       [placeholder]="('mydspace.results.no-date' | translate)"></ds-item-detail-preview-field>
         <ds-item-detail-preview-field [item]="item"
                                       [object]="object"
-                                      [label]="('item.page.author' | translate)"
+                                      [label]="('item.page.authors' | translate)"
                                       [metadata]="['dc.contributor', 'dc.creator', 'dc.contributor.*']"
                                       [separator]="separator"
                                       [placeholder]="('mydspace.results.no-authors' | translate)"></ds-item-detail-preview-field>

diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
@@ -1310,6 +1310,34 @@
   "item.orcid.return": "رجوع",
   "item.listelement.badge": "المادة",
   "item.page.description": "الوصف",
+
+  // "item.page.org-units": "Organizational Units",
+  "item.page.org-units": "وحدات مؤسسية",
+
+  // "item.page.projects": "Research Projects",
+  "item.page.projects": "مشاريع البحث",
+
+  // "item.page.publications": "Publications",
+  "item.page.publications": "منشورات",
+
+  // "item.page.articles": "Articles",
+  "item.page.articles": "مقالات",
+
+  // "item.page.journal": "Journal",
+  "item.page.journal": "الدوري",
+
+  // "item.page.journal-issue": "Journal Issue",
+  "item.page.journal-issue": "عدد الدوري",
+
+  // "item.page.journal-issues": "Journal Issues",
+  "item.page.journal-issues": "سجل الدوري",
+
+  // "item.page.journal-volume": "Journal Volume",
+  "item.page.journal-volume": "سلسلة الدورية",
+
+  // "item.page.journal-volumes": "Journal Volumes",
+  "item.page.journal-volumes": "سلسلة الدوريات",
+
   "item.page.journal-issn": "ردمد الدورية",
   "item.page.journal-title": "عنوان الدوري",
   "item.page.publisher": "الناشر",
@@ -1341,7 +1369,7 @@
   "confidence.indicator.help-text.unset": "لم يتم تسجيل الثقة بهذه القيمة أبدًا",
   "confidence.indicator.help-text.unknown": "قيمة ثقة غير معروفة",
   "item.page.abstract": "أ",
-  "item.page.author": "المؤلفين",
+  "item.page.authors": "المؤلفين",
   "item.page.citation": "المرسل",
   "item.page.collections": "مقبول",
   "item.page.collections.loading": "جاري التحميل...",

diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5
@@ -3403,6 +3403,33 @@
   // "item.page.description": "Description",
   "item.page.description": "বর্ণনা",
 
+  // "item.page.org-units": "Organizational Units",
+  "item.page.org-units": "সাংগঠনিক ইউনিট",
+
+  // "item.page.projects": "Research Projects",
+  "item.page.projects": "গবেষণা প্রকল্পগুলো",
+
+  // "item.page.publications": "Publications",
+  "item.page.publications": "প্রকাশনা",
+
+  // "item.page.articles": "Articles",
+  "item.page.articles": "নিবন্ধসমূহ",
+
+  // "item.page.journal": "Journal",
+  "item.page.journal": "জার্নাল",
+
+  // "item.page.journal-issue": "Journal Issue",
+  "item.page.journal-issue": "জার্নাল ইস্যু",
+
+  // "item.page.journal-issues": "Journal Issues",
+  "item.page.journal-issues": "জার্নাল সমস্যা",
+
+  // "item.page.journal-volume": "Journal Volume",
+  "item.page.journal-volume": "জার্নাল ভলিউম",
+
+  // "item.page.journal-volumes": "Journal Volumes",
+  "item.page.journal-volumes": "জার্নাল ভলিউম",
+
   // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "জার্নাল ইশান",
 
@@ -3429,8 +3456,8 @@
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "বিমূর্ত",
 
-  // "item.page.author": "Authors",
-  "item.page.author": "লেখক",
+  // "item.page.authors": "Authors",
+  "item.page.authors": "লেখক",
 
   // "item.page.citation": "Citation",
   "item.page.citation": "উদ্ধৃতি",

diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
@@ -3648,6 +3648,33 @@
   // "item.page.description": "Description",
   "item.page.description": "Descripció",
 
+  // "item.page.org-units": "Organizational Units",
+  "item.page.org-units": "Unitats organitzatives",
+
+  // "item.page.projects": "Research Projects",
+  "item.page.projects": "Projectes de recerca",
+
+  // "item.page.publications": "Publications",
+  "item.page.publications": "Publicacions",
+
+  // "item.page.articles": "Articles",
+  "item.page.articles": "Articles",
+
+  // "item.page.journal": "Journal",
+  "item.page.journal": "Revista",
+
+  // "item.page.journal-issue": "Journal Issue",
+  "item.page.journal-issue": "Número de la revista",
+
+  // "item.page.journal-issues": "Journal Issues",
+  "item.page.journal-issues": "Números de revista",
+
+  // "item.page.journal-volume": "Journal Volume",
+  "item.page.journal-volume": "Volum de la revista",
+
+  // "item.page.journal-volumes": "Journal Volumes",
+  "item.page.journal-volumes": "Volums de revistes",
+
   // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "ISSN de la revista",
 
@@ -3680,8 +3707,8 @@
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resum",
 
-  // "item.page.author": "Authors",
-  "item.page.author": "Autors",
+  // "item.page.authors": "Authors",
+  "item.page.authors": "Autors",
 
   // "item.page.citation": "Citation",
   "item.page.citation": "Citació",

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
@@ -4161,6 +4161,33 @@
   // "item.page.description": "Description",
   "item.page.description": "Popis",
 
+  // "item.page.org-units": "Organizational Units",
+  "item.page.org-units": "Organizační jednotky",
+
+  // "item.page.projects": "Research Projects",
+  "item.page.projects": "Výzkumné projekty",
+
+  // "item.page.publications": "Publications",
+  "item.page.publications": "Publikace",
+
+  // "item.page.articles": "Articles",
+  "item.page.articles": "Články",
+
+  // "item.page.journal": "Journal",
+  "item.page.journal": "Časopisu",
+
+  // "item.page.journal-issue": "Journal Issue",
+  "item.page.journal-issue": "Číslo časopisu",
+
+  // "item.page.journal-issues": "Journal Issues",
+  "item.page.journal-issues": "Čísla časopisu",
+
+  // "item.page.journal-volume": "Journal Volume",
+  "item.page.journal-volume": "Ročník časopisu",
+
+  // "item.page.journal-volumes": "Journal Volumes",
+  "item.page.journal-volumes": "Ročníky časopisu",
+
   // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "ISSN časopisu",
 
@@ -4267,8 +4294,8 @@
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Abstrakt",
 
-  // "item.page.author": "Authors",
-  "item.page.author": "Autor",
+  // "item.page.authors": "Authors",
+  "item.page.authors": "Autor",
 
   // "item.page.citation": "Citation",
   "item.page.citation": "Citace",

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
@@ -3226,6 +3226,33 @@
   // "item.page.description": "Description",
   "item.page.description": "Beschreibung",
 
+  // "item.page.org-units": "Organizational Units",
+  "item.page.org-units": "Organisationseinheiten",
+
+  // "item.page.projects": "Research Projects",
+  "item.page.projects": "Forschungsvorhaben",
+
+  // "item.page.publications": "Publications",
+  "item.page.publications": "Publikationen",
+
+  // "item.page.articles": "Articles",
+  "item.page.articles": "Artikel",
+
+  // "item.page.journal": "Journal",
+  "item.page.journal": "Zeitschrift",
+
+  // "item.page.journal-issue": "Journal Issue",
+  "item.page.journal-issue": "Zeitschriftenheft",
+
+  // "item.page.journal-issues": "Journal Issues",
+  "item.page.journal-issues": "Zeitschriftenhefte",
+
+  // "item.page.journal-volume": "Journal Volume",
+  "item.page.journal-volume": "Zeitschriftenband",
+
+  // "item.page.journal-volumes": "Journal Volumes",
+  "item.page.journal-volumes": "Zeitschriftenbände",
+
   // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "ISSN der Zeitschrift",
 
@@ -3252,8 +3279,8 @@
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Zusammenfassung",
 
-  // "item.page.author": "Authors",
-  "item.page.author": "Autor:innen",
+  // "item.page.authors": "Authors",
+  "item.page.authors": "Autor:innen",
 
   // "item.page.citation": "Citation",
   "item.page.citation": "Zitierform",