Skip to content
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.

Sign up for GitHub

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

5623 facets translation #5624

Closed
wants to merge 9 commits into from
Closed

5623 facets translation #5624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a88bbb6
Merge pull request #5420 from IQSS/develop
kcondon Dec 20, 2018
1a12cda
Merge pull request #5439 from IQSS/develop
kcondon Jan 7, 2019
30ee2f1
Merge pull request #5561 from IQSS/develop
kcondon Feb 19, 2019
71a13e3
Pruebas de formateo para buscar error en la fecha en la v4.9.11
juancorr Mar 1, 2019
7e4a84c
Inital commit to search translated facet failures
juancorr Mar 7, 2019
fa2d5d7
5623 Facets translation issue
juancorr Mar 12, 2019
2fd4be6
Revert "5623 Facets translation issue"
juancorr Mar 12, 2019
719ecc8
5623 Facets translation issue
juancorr Mar 12, 2019
5d315e7
5623 Facets translation issue
juancorr Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -682,7 +683,8 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
stringBuilder.append(getCapitalizedName(part.toLowerCase()) + " ");
}
String friendlyNameWithTrailingSpace = stringBuilder.toString();
String friendlyName = friendlyNameWithTrailingSpace.replaceAll(" $", "");
String originalFrienlyName = friendlyNameWithTrailingSpace.replaceAll(" $", "");
String friendlyName= getLocaleTitle(staticSearchField, originalFrienlyName);
facetCategory.setFriendlyName(friendlyName);
// logger.info("adding <<<" + staticSearchField + ":" + friendlyName + ">>>");
staticSolrFieldFriendlyNamesBySolrField.put(staticSearchField, friendlyName);
Expand Down Expand Up @@ -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;
}
}
}