Shib conversion: update messages per #3085

IQSS · Apr 25, 2016 · e195cbb · e195cbb
1 parent a32c290
commit e195cbb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -198,9 +198,9 @@ login.error=Error validating the username, email address, or password. Please tr
 #shib.xhtml
 shib.btn.convertAccount=Convert Account
 shib.btn.createAccount=Create Account
-shib.welcome=Welcome,
+shib.askToConvert=Would you like to convert your Dataverse account to always use your institutional log in?
 # Bundle file editors, please note that "shib.welcomeExistingUserMessage" is used in a unit test
-shib.welcomeExistingUserMessage=Your institutional log in for {0} matches an email address already being used for a Dataverse account. By entering your current Dataverse password below, your existing Dataverse account can be converted to use your institutional log in.
+shib.welcomeExistingUserMessage=Your institutional log in for {0} matches an email address already being used for a Dataverse account. By entering your current Dataverse password below, your existing Dataverse account can be converted to use your institutional log in. After converting, you will only need to use your institutional log in.
 # Bundle file editors, please note that "shib.welcomeExistingUserMessageDefaultInstitution" is used in a unit test
 shib.welcomeExistingUserMessageDefaultInstitution=your institution
 shib.dataverseUsername=Dataverse Username

diff --git a/src/main/webapp/shib.xhtml b/src/main/webapp/shib.xhtml
@@ -24,7 +24,7 @@
 
                 <ui:fragment rendered="#{Shib.offerToConvertExistingAccount}">
                     <ui:fragment rendered="#{Shib.existingDisplayName != null}">
-                        <h2>#{bundle['shib.welcome']} #{Shib.existingDisplayName}</h2>
+                        <h2>#{bundle['shib.askToConvert']}</h2>
                     </ui:fragment>
                     <div class="alert alert-info messagePanel">
                         <p>

diff --git a/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java
@@ -55,12 +55,12 @@ public void testGetStringFromBundleWithArguments() {
                         Arrays.asList("dvAlias", "DV Name")));
         assertEquals("Your institutional log in for TestShib Test IdP matches an email address already being used for a Dataverse "
                 + "account. By entering your current Dataverse password below, your existing Dataverse account can be "
-                + "converted to use your institutional log in.",
+                + "converted to use your institutional log in. After converting, you will only need to use your institutional log in.",
                 BundleUtil.getStringFromBundle("shib.welcomeExistingUserMessage",
                         Arrays.asList("TestShib Test IdP")));
         assertEquals("Your institutional log in for your institution matches an email address already being used for a Dataverse "
                 + "account. By entering your current Dataverse password below, your existing Dataverse account can be "
-                + "converted to use your institutional log in.",
+                + "converted to use your institutional log in. After converting, you will only need to use your institutional log in.",
                 BundleUtil.getStringFromBundle("shib.welcomeExistingUserMessage",
                         Arrays.asList(BundleUtil.getStringFromBundle("shib.welcomeExistingUserMessageDefaultInstitution"))));
         assertEquals("Welcome to Root Dataverse! Get started by adding or finding data. "