Merge branch 'develop' into 8096-8205-ingest-messaging #8096 #8205

doc/sphinx-guides/source/developers/aux-file-support.rst

@@ -24,8 +24,7 @@ You should expect a 200 ("OK") response and JSON with information about your new
 
 Downloading an Auxiliary File that Belongs to a Datafile
 --------------------------------------------------------
-To download an auxiliary file, use the primary key of the datafile, and the
-formatTag and formatVersion (if applicable) associated with the auxiliary file:
+To download an auxiliary file, use the primary key of the datafile, and the formatTag and formatVersion (if applicable) associated with the auxiliary file. An API token is shown in the example below but it is not necessary if the auxiliary file was uploaded with isPublic=true and the dataset has been published.
 
 .. code-block:: bash
 
@@ -35,7 +34,7 @@ formatTag and formatVersion (if applicable) associated with the auxiliary file:
   export FORMAT_TAG='dpJson'
   export FORMAT_VERSION='v1'
   
-  curl "$SERVER_URL/api/access/datafile/$FILE_ID/auxiliary/$FORMAT_TAG/$FORMAT_VERSION"
+  curl -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/access/datafile/$FILE_ID/auxiliary/$FORMAT_TAG/$FORMAT_VERSION"
   
 Listing Auxiliary Files for a Datafile by Origin
 ------------------------------------------------
@@ -48,7 +47,7 @@ To list auxiliary files, specify the primary key of the datafile (FILE_ID), and
   export SERVER_URL=https://demo.dataverse.org
   export ORIGIN='app1'
   
-  curl "$SERVER_URL/api/access/datafile/$FILE_ID/auxiliary/$ORIGIN"
+  curl -H X-Dataverse-key:$API_TOKEN "$SERVER_URL/api/access/datafile/$FILE_ID/auxiliary/$ORIGIN"
   
 You should expect a 200 ("OK") response and a JSON array with objects representing the auxiliary files found, or a 404/Not Found response if no auxiliary files exist with that origin.
 
@@ -65,6 +64,6 @@ formatTag and formatVersion (if applicable) associated with the auxiliary file:
   export FORMAT_TAG='dpJson'
   export FORMAT_VERSION='v1'
   
-  curl -X DELETE "$SERVER_URL/api/access/datafile/$FILE_ID/auxiliary/$FORMAT_TAG/$FORMAT_VERSION"
+  curl -H X-Dataverse-key:$API_TOKEN DELETE -X "$SERVER_URL/api/access/datafile/$FILE_ID/auxiliary/$FORMAT_TAG/$FORMAT_VERSION"
   
   

src/main/java/propertyFiles/Bundle.properties

@@ -696,9 +696,9 @@ notification.email.publish.dataset.subject={0}: Your dataset has been published
 notification.email.publishFailure.dataset.subject={0}: Failed to publish your dataset
 notification.email.returned.dataset.subject={0}: Your dataset has been returned
 notification.email.workflow.success.subject={0}: Your dataset has been processed
-notification.email.workflow.success=A workflow running on {0} (view at {1}) succeeded: {2}
+notification.email.workflow.success=A workflow running on {0} (view at {1} ) succeeded: {2}
 notification.email.workflow.failure.subject={0}: Failed to process your dataset
-notification.email.workflow.failure=A workflow running on {0} (view at {1}) failed: {2}
+notification.email.workflow.failure=A workflow running on {0} (view at {1} ) failed: {2}
 notification.email.status.change.subject={0}: Dataset Status Change
 notification.email.status.change=The Status of the dataset ({0}) has changed to {1}
 notification.email.workflow.nullMessage=No additional message sent from the workflow.
@@ -714,20 +714,20 @@ notification.email.greeting.html=Hello, <br>
 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} by {1} ({2}). Manage permissions at {3}.
-notification.email.grantFileAccess=Access granted for files in dataset: {0} (view at {1}).
-notification.email.rejectFileAccess=Your request for access was rejected for the requested files in the dataset: {0} (view at {1}). If you have any questions about why your request was rejected, you may reach the dataset owner using the "Contact" link on the upper right corner of the dataset page.
+notification.email.grantFileAccess=Access granted for files in dataset: {0} (view at {1} ).
+notification.email.rejectFileAccess=Your request for access was rejected for the requested files in the dataset: {0} (view at {1} ). If you have any questions about why your request was rejected, you may reach the dataset owner using the "Contact" link on the upper right corner of the dataset page.
 # 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 - 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 - 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, {4} ({5})\!
-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.publishFailedPidReg={0} (view at {1}) in {2} (view at {3}) could not be published due to a failure to register, or update the Global Identifier for the dataset or one of the files in it. Contact support if this continues to happen. 
+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, {4} ({5})\!
+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.publishFailedPidReg={0} (view at {1} ) in {2} (view at {3} ) could not be published due to a failure to register, or update the Global Identifier for the dataset or one of the files in it. Contact support if this continues to happen. 
 notification.email.closing=\n\nYou may contact us for support at {0}.\n\nThank you,\n{1}
 notification.email.closing.html=<br><br>You may contact us for support at {0}.<br><br>Thank you,<br>{1}
-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.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.
 notification.email.passwordReset=Hi {0},\n\nSomeone, hopefully you, requested a password reset for {1}.\n\nPlease click the link below to reset your Dataverse account password:\n\n {2} \n\n The link above will only work for the next {3} minutes.\n\n Please contact us if you did not request this password reset or need further help.
 notification.email.passwordReset.subject=Dataverse Password Reset Requested