From 4e44d104080f271a971fee116596ca06aedcac51 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Fri, 26 Feb 2016 13:18:54 -0500
Subject: [PATCH] Updated welcome/create account-related app/email
 notifications. [ref #2966]

---
 src/main/java/Bundle.properties                            | 4 ++--
 .../java/edu/harvard/iq/dataverse/MailServiceBean.java     | 7 +++++--
 src/main/webapp/dataverseuser.xhtml                        | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
index 2d3056dbf9a..a2bd09d77cf 100755
--- a/src/main/java/Bundle.properties
+++ b/src/main/java/Bundle.properties
@@ -126,7 +126,7 @@ wasPublished=, was published in
 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.
-notification.welcome=Welcome to {0} {1}! Need help? Check out the <a href="{2}/{3}/user/index.html" title="Dataverse User Guide" target="_blank">User Guide</a> or post in the <a href="https://groups.google.com/forum/#!forum/dataverse-community" title="Dataverse Community - Google Group" target="_blank">Dataverse Community Google Group</a>.
+notification.welcome=Welcome to {0} Dataverse! Get started by adding or finding data. Have questions? Check out the <a href="{1}/{2}/user/index.html" title="{0} Dataverse User Guide" target="_blank">User Guide</a> or contact <a href="#" onclick="event.preventDefault();PF('contactForm').show();" title=\u201dContact {0} Dataverse Support\u201d>Dataverse Support</a> for assistance.
 notification.requestFileAccess=File access requested for dataset: <a href="/permissions-manage-files.xhtml?id={0,number,#########}" title="{1}">{1}</a>.
 notification.grantFileAccess=Access granted for files in dataset: <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a>.
 notification.rejectFileAccess=Access rejected for requested files in dataset: <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a>.
@@ -215,7 +215,7 @@ 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.greeting=Hello, \n
-notification.email.welcome=Welcome to Dataverse! Please take a look around, try everything out, and contact support@dataverse.org if you have questions or feedback.
+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.
 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}).
diff --git a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
index 5169a7b2de6..f82b7a3e666 100644
--- a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
@@ -422,8 +422,11 @@ private String getMessageTextBasedOnNotification(UserNotification userNotificati
                 messageText += MessageFormat.format(pattern, paramArrayReturnedDataset);
                 return messageText;
             case CREATEACC:
-                messageText += ResourceBundle.getBundle("Bundle").getString("notification.email.welcome");
-                return messageText;
+                String accountCreatedMessage = BundleUtil.getStringFromBundle("notification.email.welcome", Arrays.asList(
+                        systemConfig.getGuidesBaseUrl(),
+                        systemConfig.getVersion()
+                ));
+                return messageText += accountCreatedMessage;
         }
         
         return "";
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index c43acd556b8..34fab3097c5 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -116,7 +116,6 @@
                                                     <i class="icon-dataverse text-icon-inline text-muted"></i>                                        
                                                     <h:outputFormat value="#{bundle['notification.welcome']}" escape="false">
                                                         <f:param value="#{dataverseServiceBean.findRootDataverse().name}"/>
-                                                        <f:param value="#{bundle.dataverse}"/>
                                                         <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                                         <f:param value="#{systemConfig.version}"/>
                                                     </h:outputFormat>