Merge pull request #3880 from IQSS/3611-custom-dv-names

remove " Dataverse", suggest in watermark on create #3611

doc/sphinx-guides/source/installation/config.rst

@@ -433,9 +433,11 @@ The key required to create users via API as documented at :doc:`/api/native-api`
 :SystemEmail
 ++++++++++++
 
-This is the email address that "system" emails are sent from such as password reset links.
+This is the email address that "system" emails are sent from such as password reset links. Your Dataverse installation will not send mail without this setting in place.
 
-``curl -X PUT -d "Support <support@example.edu>" http://localhost:8080/api/admin/settings/:SystemEmail``
+``curl -X PUT -d 'LibraScholar SWAT Team <support@librascholar.edu>' http://localhost:8080/api/admin/settings/:SystemEmail``
+
+Note that only the email address is required, which you can supply without the ``<`` and ``>`` signs, but if you include the text, it's the way to customize the name of your support team, which appears in the "from" address in emails as well as in help text in the UI.
 
 :FooterCopyright
 ++++++++++++++++

doc/sphinx-guides/source/style/patterns.rst

@@ -519,7 +519,7 @@ For our help/information, success, warning, and error message blocks we use a cu
             <span class="glyphicon glyphicon glyphicon-ok-sign"></span>&nbsp;<strong>Success!</strong> – The metadata for this dataset has been updated.
         </div>
         <div class="alert alert-danger">
-			<span class="glyphicon glyphicon-exclamation-sign"></span>&nbsp;<strong>Error</strong> – The username, email address, or password you entered is invalid. Need assistance accessing your account? If you believe this is an error, please contact <a href="#" class="ui-commandlink ui-widget" onclick="return false;">Dataverse Support</a> for assistance.
+			<span class="glyphicon glyphicon-exclamation-sign"></span>&nbsp;<strong>Error</strong> – The username, email address, or password you entered is invalid. Need assistance accessing your account? If you believe this is an error, please contact <a href="#" class="ui-commandlink ui-widget" onclick="return false;">Root Support</a> for assistance.
         </div>
       </div>
     </div>

doc/sphinx-guides/source/user/account.rst

@@ -99,7 +99,7 @@ If you already have a Dataverse account associated with the Username/Email log i
 Convert your Dataverse account away from your Institutional Log In
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If you are leaving your institution and need to convert your Dataverse account to the Dataverse Username/Email log in option, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link for "Dataverse Support" that will open the popup form to contact support for assistance.
+If you are leaving your institution and need to convert your Dataverse account to the Dataverse Username/Email log in option, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link that will open a popup form to contact support for assistance.
 
 ORCID Log In
 ~~~~~~~~~~~~~
@@ -132,7 +132,7 @@ If you already have a Dataverse account associated with the Username/Email log i
 Convert your Dataverse account away from ORCID for log in
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If you don't want to log in to Dataverse using ORCID any more, you will want to convert your Dataverse account to the Dataverse Username/Email log in option. To do this, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link for "Dataverse Support" that will open the popup form to contact support for assistance.
+If you don't want to log in to Dataverse using ORCID any more, you will want to convert your Dataverse account to the Dataverse Username/Email log in option. To do this, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link that will open a popup form to contact support for assistance.
 
 GitHub and Google Log In
 ~~~~~~~~~~~~~~~~~~~~~~~~~

scripts/api/setup-optional-harvard.sh

@@ -21,7 +21,7 @@ echo  "- Enabling Geoconnect"
 curl -s -X PUT -d true "$SERVER/admin/settings/:GeoconnectCreateEditMaps"
 curl -s -X PUT -d true "$SERVER/admin/settings/:GeoconnectViewMaps"
 echo  "- Setting system email"
-curl -X PUT -d "Dataverse Support <support@dataverse.org>" http://localhost:8080/api/admin/settings/:SystemEmail
+curl -X PUT -d "Harvard Dataverse Support <support@dataverse.org>" http://localhost:8080/api/admin/settings/:SystemEmail
 curl -X PUT -d ", The President &#38; Fellows of Harvard College" http://localhost:8080/api/admin/settings/:FooterCopyright
 echo "- Setting up the Harvard Shibboleth institutional group"
 curl -s -X POST -H 'Content-type:application/json' --upload-file data/shibGroupHarvard.json "$SERVER/admin/groups/shib?key=$adminKey"

scripts/database/upgrades/upgrade_v4.6.2_to_v4.7.sql

@@ -0,0 +1,2 @@
+--Uncomment to preserve "Dataverse" at end of each dataverse name.
+--UPDATE dataverse SET name = name || ' Dataverse';

src/main/java/Bundle.properties

@@ -112,11 +112,11 @@ messages.validation.msg=Required fields were missed or there was a validation er
 
 # contactFormFragment.xhtml
 
-contact.header=Contact Dataverse Support
+contact.header=Contact {0}
 contact.dataverse.header=Email Dataverse Contact
 contact.dataset.header=Email Dataset Contact
 contact.to=To
-contact.support=Dataverse Support
+contact.support=Support
 contact.from=From
 contact.from.required=User email is required.
 contact.from.invalid=Email is invalid.
@@ -154,7 +154,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}.
@@ -498,48 +498,48 @@ harvestserver.viewEditDialog.btn.save=Save Changes
 
 #MailServiceBean.java
 
-notification.email.create.dataverse.subject=Dataverse: Your dataverse has been created
-notification.email.create.dataset.subject=Dataverse: Your dataset has been created
-notification.email.request.file.access.subject=Dataverse: Access has been requested for a restricted file
-notification.email.grant.file.access.subject=Dataverse: You have been granted access to restricted file 
-notification.email.rejected.file.access.subject=Dataverse: Your request for access to restricted file has been rejected              
-notification.email.update.maplayer=Dataverse: WorldMap layer added to dataset
-notification.email.maplayer.deletefailed.subject=Failed to delete WorldMap layer
+notification.email.create.dataverse.subject={0}: Your dataverse has been created
+notification.email.create.dataset.subject={0}: Your dataset has been created
+notification.email.request.file.access.subject={0}: Access has been requested for a restricted file
+notification.email.grant.file.access.subject={0}: You have been granted access to a restricted file
+notification.email.rejected.file.access.subject={0}: Your request for access to a restricted file has been rejected
+notification.email.update.maplayer={0}: WorldMap layer added to dataset
+notification.email.maplayer.deletefailed.subject={0}: Failed to delete WorldMap layer
 notification.email.maplayer.deletefailed.text=We failed to delete the WorldMap layer associated with the restricted file {0}, and any related data that may still be publicly available on the WorldMap site. Please try again, or contact WorldMap and/or Dataverse support. (Dataset: {1})
-notification.email.submit.dataset.subject=Dataverse: Your dataset has been submitted for review
-notification.email.publish.dataset.subject=Dataverse: Your dataset has been published
-notification.email.returned.dataset.subject=Dataverse: Your dataset has been returned 
-notification.email.create.account.subject=Dataverse: Your account has been created 
-notification.email.assign.role.subject=Dataverse: You have been assigned a role
-notification.email.revoke.role.subject=Dataverse: Your role has been revoked
-notification.email.verifyEmail.subject=Dataverse: Verify your email address
+notification.email.submit.dataset.subject={0}: Your dataset has been submitted for review
+notification.email.publish.dataset.subject={0}: Your dataset has been published
+notification.email.returned.dataset.subject={0}: Your dataset has been returned
+notification.email.create.account.subject={0}: Your account has been created
+notification.email.assign.role.subject={0}: You have been assigned a role
+notification.email.revoke.role.subject={0}: Your role has been revoked
+notification.email.verifyEmail.subject={0}: Verify your email address
 
 notification.email.greeting=Hello, \n
 # Bundle file editors, please note that "notification.email.welcome" is used in a unit test
-notification.email.welcome=Welcome to Dataverse! Get started by adding or finding data. Have questions? Check out the User Guide at {0}/{1}/user/ or contact Dataverse Support for assistance. Want to test out Dataverse features? Use our Demo Site at https://demo.dataverse.org
+notification.email.welcome=Welcome to {0}! Get started by adding or finding data. Have questions? Check out the User Guide at {1}/{2}/user or contact {3} at {4} for assistance.
 notification.email.welcomeConfirmEmailAddOn=\n\nPlease verify your email address at {0}. Note, the verify link will expire after {1}. Send another verification email by visiting your account page.
 notification.email.requestFileAccess=File access requested for dataset: {0}. Manage permissions at {1}.
 notification.email.grantFileAccess=Access granted for files in dataset: {0} (view at {1}).
 notification.email.rejectFileAccess=Access rejected for requested files in dataset: {0} (view at {1}).
 # Bundle file editors, please note that "notification.email.createDataverse" is used in a unit test
-notification.email.createDataverse=Your new dataverse named {0} (view at {1} ) was created in {2} (view at {3} ). To learn more about what you can do with your dataverse, check out the Dataverse Management - Dataverse User Guide at {4}/{5}/user/dataverse-management.html .
+notification.email.createDataverse=Your new dataverse named {0} (view at {1} ) was created in {2} (view at {3} ). To learn more about what you can do with your dataverse, check out the Dataverse Management - User Guide at {4}/{5}/user/dataverse-management.html .
 # Bundle file editors, please note that "notification.email.createDataset" is used in a unit test
-notification.email.createDataset=Your new dataset named {0} (view at {1} ) was created in {2} (view at {3} ). To learn more about what you can do with a dataset, check out the Dataset Management - Dataset User Guide at {4}/{5}/user/dataset-management.html .
-notification.email.wasSubmittedForReview={0} (view at {1}) was submitted for review to be published in {2}  (view at {3}). Don't forget to publish it or send it back to the contributor\!
+notification.email.createDataset=Your new dataset named {0} (view at {1} ) was created in {2} (view at {3} ). To learn more about what you can do with a dataset, check out the Dataset Management - User Guide at {4}/{5}/user/dataset-management.html .
+notification.email.wasSubmittedForReview={0} (view at {1}) was submitted for review to be published in {2} (view at {3}). Don't forget to publish it or send it back to the contributor\!
 notification.email.wasReturnedByReviewer={0} (view at {1}) was returned by the curator of {2} (view at {3}).
 notification.email.wasPublished={0} (view at {1}) was published in {2} (view at {3}).
 notification.email.worldMap.added={0} (view at {1}) had WorldMap layer data added to it.
-notification.email.closing=\n\nThank you,\nThe Dataverse Project
+notification.email.closing=\n\nThank you,\n{0}
 notification.email.assignRole=You are now {0} for the {1} "{2}" (view at {3}).
 notification.email.revokeRole=One of your roles for the {0} "{1}" has been revoked (view at {2}).
 notification.email.changeEmail=Hello, {0}.{1}\n\nPlease contact us if you did not intend this change or if you need assistance.
 hours=hours
 hour=hour
 minutes=minutes
 minute=minute
-notification.email.checksumfail.subject=Dataverse: Your upload failed checksum validation.
-notification.email.import.filesystem.subject=Dataverse: Your file import job has completed
-notification.email.import.checksum.subject=Dataverse: Your file checksum job has completed
+notification.email.checksumfail.subject={0}: Your upload failed checksum validation
+notification.email.import.filesystem.subject={0}: Your file import job has completed
+notification.email.import.checksum.subject={0}: Your file checksum job has completed
 
 # passwordreset.xhtml
 
@@ -951,7 +951,7 @@ dataset.manageTemplates.tab.action.btn.delete.dialog.header=Delete Template
 dataset.manageTemplates.tab.action.btn.view.dialog.header=Dataset Template Preview
 dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate=Dataset Template
 dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate.title=The dataset template which prepopulates info into the form automatically.
-dataset.manageTemplates.tab.action.noedit.createdin=Template created at {0} Dataverse
+dataset.manageTemplates.tab.action.noedit.createdin=Template created at {0}
 dataset.manageTemplates.delete.usedAsDefault=This template is the default template for the following dataverse(s). It will be removed as default as well.
 dataset.manageTemplates.info.message.notEmptyTable=Create, clone, edit, view, or delete dataset templates. Create a dataset template to prefill metadata fields with standard values, such as author affiliation, to help users create datasets in this dataverse. You can also add help text directly into the metadata fields to give users more information on what to add to these metadata fields.
 
@@ -1034,7 +1034,7 @@ dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook=Guestbook N
 dataset.manageGuestbooks.tab.action.btn.viewCollectedData.dialog.header=Dataset Guestbook Collected Data
 dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title=User data collected by the guestbook.
 dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData=Collected Data
-dataset.manageGuestbooks.tab.action.noedit.createdin=Guestbook created at {0} Dataverse
+dataset.manageGuestbooks.tab.action.noedit.createdin=Guestbook created at {0}
 dataset.manageGuestbooks.message.deleteSuccess=The guestbook has been deleted.
 dataset.manageGuestbooks.message.deleteFailure=The guestbook cannot be deleted.
 dataset.manageGuestbooks.message.editSuccess=The guestbook has been updated.
@@ -1383,11 +1383,11 @@ file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title=Relatio
 file.dataFilesTab.terms.list.guestbook=Guestbook
 file.dataFilesTab.terms.list.guestbook.title=User information (i.e., name, email, institution, and position) will be collected when files are downloaded.
 file.dataFilesTab.terms.list.guestbook.noSelected.tip=No guestbook is assigned to this dataset, you will not be prompted to provide any information on file download.
-file.dataFilesTab.terms.list.guestbook.noSelected.admin.tip=There are no guestbooks available in {0} Dataverse to assign to this dataset.
+file.dataFilesTab.terms.list.guestbook.noSelected.admin.tip=There are no guestbooks available in {0} to assign to this dataset.
 file.dataFilesTab.terms.list.guestbook.inUse.tip=The following guestbook will prompt a user to provide additional information when downloading a file.
 file.dataFilesTab.terms.list.guestbook.viewBtn=Preview Guestbook
 file.dataFilesTab.terms.list.guestbook.select.tip=Select a guestbook to have a user provide additional information when downloading a file.
-file.dataFilesTab.terms.list.guestbook.noAvailable.tip=There are no guestbooks enabled in {0} Dataverse. To create a guestbook, return to {0} Dataverse, click the "Edit" button and select the "Dataset Guestbooks" option.
+file.dataFilesTab.terms.list.guestbook.noAvailable.tip=There are no guestbooks enabled in {0}. To create a guestbook, return to {0}, click the "Edit" button and select the "Dataset Guestbooks" option.
 file.dataFilesTab.terms.list.guestbook.clearBtn=Clear Selection
 
 file.dataFilesTab.versions=Versions

src/main/java/edu/harvard/iq/dataverse/AbstractIdServiceBean.java

@@ -53,7 +53,7 @@ protected HashMap<String, String> addBasicMetadata(Dataset datasetIn, HashMap<St
             authorString = ":unav";
         }
 
-        String producerString = dataverseService.findRootDataverse().getName() + " Dataverse";
+        String producerString = dataverseService.findRootDataverse().getName();
 
         if(producerString.isEmpty()) {
             producerString = ":unav";

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 "";
         }

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

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;
@@ -302,6 +303,9 @@ public String init() {
             dataverse.setAffiliation(session.getUser().getDisplayInfo().getAffiliation());
             setupForGeneralInfoEdit();
             // FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Create New Dataverse", " - Create a new dataverse that will be a child dataverse of the parent you clicked from. Asterisks indicate required fields."));
+            if (dataverse.getName() == null) {
+                dataverse.setName(DataverseUtil.getSuggestedDataverseNameOnCreate(session.getUser()));
+            }
         }
 
         return null;