From d277aa1a8c652a33d077974162dca99138722f06 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Fri, 16 Apr 2021 11:20:03 -0400
Subject: [PATCH] standardize on "Restricted with Access Granted" #7400

---
 src/main/java/propertyFiles/Bundle.properties | 3 +--
 src/main/webapp/file-info-fragment.xhtml      | 2 +-
 src/main/webapp/file.xhtml                    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index ad7742a9e90..c4a8ae64cc1 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -10,8 +10,7 @@ files=Files
 file=File
 public=Public
 restricted=Restricted
-restrictedaccess=Restricted Access
-restrictedWithAccessGranted=Restricted with Access Granted
+restrictedaccess=Restricted with Access Granted
 find=Find
 search=Search
 language=Language
diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
index 3595a7183a3..542b9a37e6f 100644
--- a/src/main/webapp/file-info-fragment.xhtml
+++ b/src/main/webapp/file-info-fragment.xhtml
@@ -38,7 +38,7 @@
                 <div class="file-icon-restricted-block" title="#{bundle['file.metaData.fileAccess']}#{bundle['restricted']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and !fileDownloadHelper.canDownloadFile(fileMetadata)}">
                     <span class="glyphicon glyphicon-lock text-danger"/>
                 </div>
-                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.fileAccess']}#{bundle['restrictedWithAccessGranted']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata)}">
+                <div class="file-icon-restricted-block" title="#{bundle['file.metaData.fileAccess']}#{bundle['restrictedaccess']}" data-toggle="tooltip" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata)}">
                     <span class="icon-unlock text-success"/>
                 </div>
             </div>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 0f462eab0d0..0e4931e7086 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -62,7 +62,7 @@
                                     <div id="title-label-block" class="margin-top-half">
                                         <!-- Restricted File Icon -->
                                         <span class="glyphicon glyphicon-lock text-danger" title="#{bundle['restricted']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}"/>
-                                        <span class="icon-unlock text-success" title="#{bundle['restrictedWithAccessGranted']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
+                                        <span class="icon-unlock text-success" title="#{bundle['restrictedaccess']}" data-toggle="tooltip" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
                                         <!-- DATASET Publication Status -->
                                         <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
                                         <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>