make "create dataverse" email subject dynamic #3611 #2710

IQSS · Jun 7, 2017 · 4550e4d · 4550e4d
1 parent e8fdd34
commit 4550e4d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -498,7 +498,7 @@ harvestserver.viewEditDialog.btn.save=Save Changes
 
 #MailServiceBean.java
 
-notification.email.create.dataverse.subject=Dataverse: Your dataverse has been created
+notification.email.create.dataverse.subject={0}: 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 

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java
@@ -35,7 +35,7 @@ public static String getSubjectTextBasedOnNotification(UserNotification userNoti
             case REVOKEROLE:
                 return ResourceBundle.getBundle("Bundle").getString("notification.email.revoke.role.subject");
             case CREATEDV:
-                return ResourceBundle.getBundle("Bundle").getString("notification.email.create.dataverse.subject");
+                return BundleUtil.getStringFromBundle("notification.email.create.dataverse.subject", Arrays.asList(BrandingUtil.getInstallationBrandName(rootDataverseName)));
             case REQUESTFILEACCESS:
                 return ResourceBundle.getBundle("Bundle").getString("notification.email.request.file.access.subject");
             case GRANTFILEACCESS:

diff --git a/src/test/java/edu/harvard/iq/dataverse/util/MailUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/MailUtilTest.java
@@ -43,4 +43,9 @@ public void testSubjectAssignRole() {
         assertEquals("Dataverse: You have been assigned a role", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName));
     }
 
+    @Test
+    public void testSubjectCreateDataverse() {
+        userNotification.setType(UserNotification.Type.CREATEDV);
+        assertEquals("LibraScholar: Your dataverse has been created", MailUtil.getSubjectTextBasedOnNotification(userNotification, rootDataverseName));
+    }
 }