-
Notifications
You must be signed in to change notification settings - Fork 442
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Made the labels in edit relationships tab unique #3307
base: main
Are you sure you want to change the base?
Made the labels in edit relationships tab unique #3307
Conversation
And fixed it for all the languages 🍞
…8157_entity-label-fix_contribute-main # Conflicts: # src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts # src/assets/i18n/ar.json5 # src/assets/i18n/cs.json5 # src/assets/i18n/en.json5 # src/assets/i18n/pt-BR.json5
…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
Hi @alexandrevryghem, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@alexandrevryghem : We gave this a quick group review in our Developer Meeting today. Overall, the logic here makes sense & I can understand how you'd want these i18n labels to be different for different pages/components.
The big challenge is that this touches a large number of i18n json5
files, so it's going to hit frequent merge conflicts. I think we'll need to find way to get this merge conflict free & test/merge rapidly for 9.0. I'd hesitate to backport this PR because it changes so many i18n labels, but it seems good for 9.0.
Overall, there were no objections to this approach & it makes sense. We just need to try to merge it quickly once this has merge conflicts resolved, as it will hit frequent merge conflicts.
Hi @alexandrevryghem, |
Description
Currently, the relationship type labels are not unique and don't work well when the relationship type is not in the form
is{Entity1}Of{Entity2}
. This PR ensures they are unique by including the two entity types and the relationship type in the label.Instructions for Reviewers
List of changes in this PR:
getRelationshipMessageKey
works by always forming the labels in the form:relationships.${currentEntityType}.${relationshipType}.${relatedEntityType}
(both entity types are required in order to support the use case from Entities relations with invalid associations shown #1387)Publication
label on the OrgUnit's edit relationship tab to:Organisation Publications
&Authored Publications
Guidance for how to test or review this PR:
dspace/config/entities/relationship-types.xml
)Checklist
main
branch of code (unless it is a backport or is fixing an issue specific to an older branch).yarn lint
yarn check-circ-deps
)package.json
), I've made sure their licenses align with the DSpace BSD License based on the Licensing of Contributions documentation.