diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java index 04901264455..dc6bf6f2641 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java @@ -510,7 +510,9 @@ public int compareTo(DatasetFieldType o) { public String getDisplayName() { if (isHasParent() && !parentDatasetFieldType.getTitle().equals(title)) { - return parentDatasetFieldType.getLocaleTitle() + " " + getLocaleTitle(); + return parentDatasetFieldType.getLocaleTitle() + ": " + getLocaleTitle(); + // The ": " is a solution to French and Spanish translation. Another solution is return only the parent title: + // return parentDatasetFieldType.getLocaleTitle() } else { return getLocaleTitle(); } diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java index 77a5e3ef563..329ab0b5f46 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; +import java.util.MissingResourceException; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -682,7 +683,8 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List>>"); staticSolrFieldFriendlyNamesBySolrField.put(staticSearchField, friendlyName); @@ -930,4 +932,11 @@ private String getPermissionFilterQuery(DataverseRequest dataverseRequest, SolrQ } + public String getLocaleTitle(String title, String originalTitle) { + try { + return BundleUtil.getStringFromPropertyFile("datasetfieldtype." + title + ".title", "citation"); + } catch (MissingResourceException e) { + return originalTitle; + } + } }