Merged
Conversation
Conflicts: src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java src/main/webapp/dataset.xhtml
Member
@qqmyers can you please provide a "compare" link that shows just the changes in the file above. I tried but I'm getting many more changes with GlobalDataverseCommunityConsortium/dataverse@SPO/7388-lang_attributes_in_DDI_export...GlobalDataverseCommunityConsortium:SPO/6751-cvv-i18n @djbrooke it probably makes sense to get pull request #7958 merged before we review this one. |
SPO/6751-cvv-i18n Conflicts: src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java
Conflicts: src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java
qqmyers
added a commit
to GlobalDataverseCommunityConsortium/dataverse
that referenced
this pull request
Jul 28, 2021
SPO/6751-cvv-i18n Conflicts: doc/sphinx-guides/source/installation/config.rst
tracks mdLang if set, otherwise UI lang
SPO/6751-cvv-i18n Conflicts: doc/sphinx-guides/source/installation/config.rst src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
Conflicts: src/test/java/edu/harvard/iq/dataverse/export/DDIExporterTest.java
scolapasta
approved these changes
Aug 30, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it: This PR adds support for reporting (internal) controlled vocabulary values in the DDI XML metadata export, improving CESSDA conformance. When translations are available, CVV values are reported in the dataset's metadata language (as defined in #7958) and in the Dataverse instance's default locale's language, if that is different.
This PR applies the new mechanism to the subject field in the citation block and includes support for several socialscience metadatablock fields that are currently not CVV, but have been changed by Sciences PO using what I think are standard values - (see 28eafaa) which will probably result in another PR.
Which issue(s) this PR closes:
Closes #6751
Special notes for your reviewer: This PR includes #7958 as those changes are required. Once that's merged, I'll update this. FWIW, I think the only changes unique to this PR are in DdiExportUtil.java.
It should be possible to add to the tests for this, but only if there are translations supplied for another/test language. Since those are currently managed separately, I'm not sure how if there's a good way to add such a test.
Suggestions on how to test this: Configure dataverse with a properties file translating the citation block to another language. Pick that language (as in #7958) as the dataset's metadata language. Add a subject value(s) to a dataset using a metadata language and publish. The resulting ddi xml export should have subject entries in both languages, with xml:lang attribute tags specifying the languages used.
Does this PR introduce a user interface change? If mockups are available, please link/include them here: No
Is there a release notes update needed for this change?: Maybe? For the whole set of Sciences PO PRs, a note could be made re: the improved CESSDA compliance. I can provide some verbiage.
Additional documentation: