Changed the retention metadata GUI text

GlobalDataverseCommunityConsortium · Mar 26, 2024 · d95cd7f · d95cd7f
1 parent 6005657
commit d95cd7f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
@@ -31,9 +31,10 @@ embargoed.wasthrough=Was embargoed until
 embargoed.willbeuntil=Draft: will be embargoed until
 embargo.date.invalid=Date is outside the allowed range: ({0} to {1})
 embargo.date.required=An embargo date is required
-retention.after=Was under retention until
-retention.isfrom=Is under retention until
-retention.willbeafter=Draft: will be under retention until
+retention.after=Was retained until
+retention.isfrom=Is retained until
+retention.willbeafter=Draft: will be retained until
+retention.enddateinfo=after this date the file is not available
 retention.date.invalid=Date is outside the allowed range: ({0} to {1})
 retention.date.required=A retention end date is required
 cancel=Cancel
@@ -1859,7 +1860,7 @@ file.retention=Retention Period
 file.editRetention=Edit Retention Period
 file.editRetention.add=Add or Change
 file.editRetention.delete=Remove
-file.editRetentionDialog.tip=Edit the planned retention period for the selected file or files. Once this dataset version is published, you will need to contact an administrator to change the retention period date or reason of the file or files.
+file.editRetentionDialog.tip=Edit the planned retention period for the selected file or files. Once this dataset version is published, you will need to contact an administrator to change the retention period date or reason of the file or files. \n After the retention period expires the files become unavailable for download.
 file.editRetentionDialog.some.tip=One or more of the selected files have already been published. Contact an administrator to change the retention period date or reason of the file or files.
 file.editRetentionDialog.none.tip=The selected file or files have already been published. Contact an administrator to change the retention period date or reason of the file or files.
 file.editRetentionDialog.partial.tip=Any changes you make here will not be made to these files.

diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
@@ -64,7 +64,7 @@
                 <div class="dateCreatePublish-block">
                     <h:outputText id="fileCreatePublishDate" value="#{fileMetadata.dataFile.released ? ((fileMetadata.dataFile.embargo!=null) ? bundle['metadatareleased'] : bundle['published']) : bundle['deposited']} #{fileMetadata.getFileDateToDisplay()}" rendered="#{!(empty fileMetadata.id)}"/>
                     <h:outputText id="embargoDate" class="embargoright" value="#{fileMetadata.dataFile.released ? ((dataFileServiceBean.isActivelyEmbargoed(fileMetadata)) ? bundle['embargoed.until'] : bundle['embargoed.wasthrough']):bundle['embargoed.willbeuntil']} #{fileMetadata.dataFile.embargo.formattedDateAvailable}" rendered="#{!(empty fileMetadata.dataFile.embargo)}"/>
-                    <h:outputText id="retentionDate" class="retentionright" value="#{fileMetadata.dataFile.released ? ((dataFileServiceBean.isRetentionExpired(fileMetadata)) ? bundle['retention.after'] : bundle['retention.isfrom']):bundle['retention.willbeafter']} #{fileMetadata.dataFile.retention.formattedDateUnavailable}" rendered="#{!(empty fileMetadata.dataFile.retention)}"/>
+                    <h:outputText id="retentionDate" class="retentionright" value="#{fileMetadata.dataFile.released ? ((dataFileServiceBean.isRetentionExpired(fileMetadata)) ? bundle['retention.after'] : bundle['retention.isfrom']):bundle['retention.willbeafter']} #{fileMetadata.dataFile.retention.formattedDateUnavailable}, #{bundle['retention.enddateinfo']}" rendered="#{!(empty fileMetadata.dataFile.retention)}"/>
                 </div>
                 <div class="downloads-block" jsf:rendered="#{!editDatafilesPage and !(settingsWrapper.rsyncOnly) and fileMetadata.dataFile.released}">
                     <h:outputFormat styleClass="visible-xs-block visible-sm-block visible-md-inline visible-lg-inline" id="fileDownloadCount" value="{0} #{bundle['metrics.downloads']}">

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -571,7 +571,7 @@
                                                         <th scope="row">
                                                             #{bundle['file.metadataTab.fileMetadata.retentionDate.label']}
                                                         </th>
-                                                        <td>#{!(empty FilePage.file.retention) ? FilePage.retentionPhrase: ''} #{!(empty FilePage.file.retention) ? FilePage.file.retention.dateUnavailable : FilePage.file.publicationDateFormattedYYYYMMDD}
+                                                        <td>#{!(empty FilePage.file.retention) ? FilePage.retentionPhrase: ''} #{!(empty FilePage.file.retention) ? FilePage.file.retention.dateUnavailable : FilePage.file.publicationDateFormattedYYYYMMDD}, #{bundle['retention.enddateinfo']}
                                                         </td>
                                                     </tr>
                                                     <tr id="fileRetentionBlock" jsf:rendered="#{!(empty FilePage.file.retention) and ! (empty FilePage.file.retention.reason)}">