diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties index 5c3fd33a754..d890926324d 100755 --- a/src/main/java/Bundle.properties +++ b/src/main/java/Bundle.properties @@ -1,4 +1,5 @@ dataverse=Dataverse +suggestedDataverseNameEnding=Dataverse newDataverse=New Dataverse hostDataverse=Host Dataverse dataverses=Dataverses @@ -154,7 +155,7 @@ wasReturnedByReviewer=, was returned by the curator of toReview=Don't forget to publish it or send it back to the contributor! worldMap.added=dataset had a WorldMap layer data added to it. # Bundle file editors, please note that "notification.welcome" is used in a unit test. -notification.welcome=Welcome to {0} Dataverse! Get started by adding or finding data. Have questions? Check out the {1}. Want to test out Dataverse features? Use our {2}. Also, check for your welcome email to verify your address. +notification.welcome=Welcome to {0}! Get started by adding or finding data. Have questions? Check out the {1}. Want to test out Dataverse features? Use our {2}. Also, check for your welcome email to verify your address. notification.demoSite=Demo Site notification.requestFileAccess=File access requested for dataset: {0}. notification.grantFileAccess=Access granted for files in dataset: {0}. diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java index c30b2db0f28..90c827b6104 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java @@ -809,7 +809,7 @@ public String getRootDataverseNameforCitation(){ } String rootDataverseName = root.getName(); if (!StringUtil.isEmpty(rootDataverseName)) { - return rootDataverseName + " Dataverse"; + return rootDataverseName; } else { return ""; } diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java index c1c1d26cc13..d8dc09f2154 100644 --- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java +++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java @@ -721,7 +721,7 @@ public String getDepositTermsOfUse() { @Override public String getDisplayName() { - return getName() + " Dataverse"; + return getName(); } @Override diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java index 9cf07d2080b..bb7a1e50497 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java @@ -4,6 +4,7 @@ import edu.harvard.iq.dataverse.authorization.Permission; import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser; import edu.harvard.iq.dataverse.authorization.users.User; +import edu.harvard.iq.dataverse.dataverse.DataverseUtil; import edu.harvard.iq.dataverse.engine.command.Command; import edu.harvard.iq.dataverse.engine.command.DataverseRequest; import edu.harvard.iq.dataverse.engine.command.exception.CommandException; @@ -1013,4 +1014,7 @@ public void validateAlias(FacesContext context, UIComponent toValidate, Object v } } + public String getSuggestedDataverseNameOnCreate() { + return DataverseUtil.getSuggestedDataverseNameOnCreate(session.getUser()); + } } diff --git a/src/main/java/edu/harvard/iq/dataverse/dataverse/DataverseUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataverse/DataverseUtil.java new file mode 100644 index 00000000000..56605f8adaa --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/dataverse/DataverseUtil.java @@ -0,0 +1,16 @@ +package edu.harvard.iq.dataverse.dataverse; + +import edu.harvard.iq.dataverse.authorization.users.User; +import edu.harvard.iq.dataverse.util.BundleUtil; + +public class DataverseUtil { + + public static String getSuggestedDataverseNameOnCreate(User user) { + if (user == null) { + return null; + } + // getDisplayInfo() is never null. + return user.getDisplayInfo().getTitle() + " " + BundleUtil.getStringFromBundle("suggestedDataverseNameEnding"); + } + +} diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml index 82f7f4c8de2..339240c82b5 100644 --- a/src/main/webapp/dataverse.xhtml +++ b/src/main/webapp/dataverse.xhtml @@ -12,7 +12,7 @@ - + @@ -57,11 +57,8 @@
-
- -
#{bundle.dataverse}
-
- + +
@@ -399,7 +396,7 @@
-
+
#{DataversePage.dataverse.alias}
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml index 94b9d5df2f3..2b634ae7680 100644 --- a/src/main/webapp/dataverse_header.xhtml +++ b/src/main/webapp/dataverse_header.xhtml @@ -186,7 +186,7 @@ #{dataverse.name} #{bundle.dataverse} diff --git a/src/main/webapp/mydata_templates/cards_minimum.html b/src/main/webapp/mydata_templates/cards_minimum.html index c0dd50db7f1..601186e35b8 100644 --- a/src/main/webapp/mydata_templates/cards_minimum.html +++ b/src/main/webapp/mydata_templates/cards_minimum.html @@ -16,7 +16,7 @@
{% if card_info.type == "dataverse" %} - {{ card_info.name }} Dataverse + {{ card_info.name }} {# (Affiliation)#} {% elif card_info.type == "dataset" %} @@ -46,7 +46,7 @@ {{ card_info.date_to_display_on_card }} {% if card_info.parentId %} {% if card_info.parentId != card_info.identifier %} - - {{ card_info.parentName }} Dataverse + - {{ card_info.parentName }} {% endif %} {% endif %} @@ -60,7 +60,7 @@
{{ card_info.date_to_display_on_card }} - - {{ card_info.parentName }} Dataverse + - {{ card_info.parentName }} {%if card_info.citationHtml %}{{ card_info.citationHtml|safe }}{% else %}{{ card_info.citation|safe }}{% endif %} diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml index 792383d2a45..2a29187e2a2 100644 --- a/src/main/webapp/search-include-fragment.xhtml +++ b/src/main/webapp/search-include-fragment.xhtml @@ -445,8 +445,8 @@ - - + + @@ -526,7 +526,7 @@ - +
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataverse/DataverseUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/dataverse/DataverseUtilTest.java new file mode 100644 index 00000000000..3a0e14f607a --- /dev/null +++ b/src/test/java/edu/harvard/iq/dataverse/dataverse/DataverseUtilTest.java @@ -0,0 +1,16 @@ +package edu.harvard.iq.dataverse.dataverse; + +import edu.harvard.iq.dataverse.mocks.MocksFactory; +import static org.junit.Assert.assertEquals; +import org.junit.Test; + +public class DataverseUtilTest { + + @Test + public void testGetSuggestedDataverseNameOnCreate() { + System.out.println("getSuggestedDataverseNameOnCreate"); + assertEquals(null, DataverseUtil.getSuggestedDataverseNameOnCreate(null)); + assertEquals("Homer Simpson Dataverse", DataverseUtil.getSuggestedDataverseNameOnCreate(MocksFactory.makeAuthenticatedUser("Homer", "Simpson"))); + } + +} diff --git a/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java index b5682e82b06..5790f47b8ea 100644 --- a/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java @@ -63,7 +63,7 @@ public void testGetStringFromBundleWithArguments() { + "converted to use your institutional log in. After converting, you will only need to use your institutional log in.", BundleUtil.getStringFromBundle("shib.welcomeExistingUserMessage", Arrays.asList(BundleUtil.getStringFromBundle("shib.welcomeExistingUserMessageDefaultInstitution")))); - assertEquals("Welcome to Root Dataverse! Get started by adding or finding data. " + assertEquals("Welcome to Root! Get started by adding or finding data. " + "Have questions? Check out the User Guide." + " Want to test out Dataverse features? Use our Demo Site." + " Also, check for your welcome email to verify your address.",