From fd3e54d97d9777fbc9c73f54fddea289e67e8431 Mon Sep 17 00:00:00 2001
From: jian881219 <jian881219@gmail.com>
Date: Thu, 26 Jun 2014 17:36:25 +0800
Subject: [PATCH 01/13]

---
 src/main/webapp/dataverseuser.xhtml | 78 +++++++++++++++--------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index 5f0bee0db0d..6c57f402e0c 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -10,11 +10,13 @@
 
     <h:body>
         <ui:composition template="/dataverse_template.xhtml">
-            <ui:param name="pageTitle" value="User"/>
+            <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>
+            <ui:param name="pageTitle" value="#{dataverseUserBundle.pageTitle}"/>
             <ui:param name="dataverse" value="#{dataverseServiceBean.findRootDataverse()}"/>
             <ui:param name="showDataverseHeader" value="false"/>
             <ui:param name="showBreadcrumbs" value="false"/>
             <ui:define name="body">
+                <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>
                 <f:metadata>
                     <f:viewParam name="id" value="#{DataverseUserPage.dataverseUser.id}"/>
                     <f:viewParam name="editMode" value="#{DataverseUserPage.editMode}"/>
@@ -44,7 +46,7 @@
                             <div class="pull-right" style="padding:0 1em 1em 1em; margin:0 0 1em 1em;">
                                 <div class="btn-group">
                                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                        <span class="glyphicon glyphicon-pencil"/> Edit Account <span class="caret"></span>
+                                        <span class="glyphicon glyphicon-pencil"/> #{dataverseUserBundle.editAccountButton} <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu pull-right text-left" role="menu">
                                         <li>
@@ -63,12 +65,12 @@
                                         <li class="divider" role="presentation"></li>
                                         <li>
                                             <p:commandLink id="editAccount" actionListener="#{DataverseUserPage.edit}" update="@all">
-                                                <h:outputText value="Account Information" />
+                                                <h:outputText value="#{dataverseUserBundle.accountInformationText}" />
                                             </p:commandLink>
                                         </li>
                                         <li>
                                             <p:commandLink id="changePassword" actionListener="#{DataverseUserPage.changePassword}" update="@all">
-                                                <h:outputText value="Password" />
+                                                <h:outputText value="#{dataverseUserBundle.passwdText}" />
                                             </p:commandLink>
                                         </li>
                                     </ul>
@@ -78,12 +80,12 @@
                     </ui:fragment>
 
                     <p:panel rendered="#{DataverseUserPage.editMode == 'FORGOT'}">
-                        <h:outputText value="If you have lost or forgotten your password, please enter your username or email address below and click Submit. We will send you an e-mail with your new password." style="color: green" />
+                        <h:outputText value="#{dataverseUserBundle.lostPasswdMsg}" style="color: green" />
                     </p:panel>
 
                     <p:tabView id="tabView2" activeIndex="#{DataverseUserPage.activeIndex}" dynamic="true" rendered="#{empty DataverseUserPage.editMode}">
                         <p:ajax event="tabChange" listener="#{DataverseUserPage.onTabChange}" update="@all" />
-                        <p:tab id="somedata" title="Data Related To Me">
+                        <p:tab id="somedata" title="#{dataverseUserBundle.dataRelatedToMeTab}">
                             <!--  <ui:fragment>
                             <p:selectOneMenu value="#{DataverseUserPage.permissionType}">
                                 <f:selectItem id="writeAccess" itemLabel="Data I have write access to..." itemValue="writeAccess" />
@@ -107,7 +109,7 @@
                                    </p:menuButton>
                                </ui:fragment>  -->
                         </p:tab>
-                        <p:tab id="notifications" title="Notifications">
+                        <p:tab id="notifications" title="#{dataverseUserBundle.notificationsTab}">
                             <ui:repeat value="#{DataverseUserPage.notificationsList}" var="item">
                                 <div style="border-bottom:1px solid #DDDDDD; padding:5px;" class="#{item.displayAsRead ? '' : 'bg-warning'}">
                                     <ui:fragment rendered="#{item.type == 'CREATEDV'}">
@@ -115,34 +117,34 @@
                                         <h:outputLink value="/dataverse.xhtml?id=#{item.objectId}" title="#{dataverseServiceBean.find(item.objectId).getName()} Dataverse">
                                             <h:outputText value="#{dataverseServiceBean.find(item.objectId).getName()} Dataverse" />
                                         </h:outputLink>
-                                        <h:outputText value=", was created in " />
+                                        <h:outputText value="#{dataverseUserBundle.wasCreatedInText}" />
                                         <h:outputLink value="/dataverse.xhtml?id=#{dataverseServiceBean.find(item.objectId).getOwner().id}" title="#{dataverseServiceBean.find(item.objectId).getOwner().getName()} Dataverse">
                                             <h:outputText value="#{dataverseServiceBean.find(item.objectId).getOwner().getName()} Dataverse" />
                                         </h:outputLink>
-                                        <h:outputText value=". Don't forget to publish it!" />
+                                        <h:outputText value="#{dataverseUserBundle.toPublishText}" />
                                     </ui:fragment>
                                     <ui:fragment rendered="#{item.type == 'CREATEDS'}">
                                         <h:graphicImage value="/resources/images/icon_dataset.png" alt="Dataset" style="height:18px;margin-right:6px;" />
                                         <h:outputLink value="/dataset.xhtml?id=#{datasetVersionServiceBean.find(item.objectId).dataset.id}">
                                             <h:outputText value="#{datasetVersionServiceBean.find(item.objectId).getTitle()}" />
                                         </h:outputLink>
-                                        <h:outputText value=", was added to " />
+                                        <h:outputText value="#{dataverseUserBundle.wasAddedToText}" />
                                         <h:outputLink value="/dataverse.xhtml?id=#{datasetVersionServiceBean.find(item.objectId).dataset.owner.id}" title="#{datasetVersionServiceBean.find(item.objectId).getDataset().getOwner().getName()} Dataverse">
                                             <h:outputText value="#{datasetVersionServiceBean.find(item.objectId).getDataset().getOwner().getName()} Dataverse" />
                                         </h:outputLink>
-                                        <h:outputText value=". Don't forget to publish it!" />
+                                        <h:outputText value="#{dataverseUserBundle.toPublishText}" />
                                     </ui:fragment>
                                     <ui:fragment rendered="#{item.type == 'CREATEACC'}">
-                                        <h:outputText value="Welcome to Dataverse 4.0 Beta! Please take a look around, try everything out, and check out our " style="padding:4px 0 4px 30px; background: url(/resources/images/icon_dataset.png) no-repeat 6px 50% / 20px;" />
+                                        <h:outputText value="#{dataverseUserBundle.welcomeToDataverseText}" style="padding:4px 0 4px 30px; background: url(/resources/images/icon_dataset.png) no-repeat 6px 50% / 20px;" />
                                         <h:outputLink value="https://groups.google.com/forum/#!forum/dataverse-community">
-                                            <h:outputText value="Google Group" style="color: blue" />
+                                            <h:outputText value="#{dataverseUserBundle.googleGroupText}" style="color: blue" />
                                         </h:outputLink>
-                                        <h:outputText value=" to leave feedback." />
+                                        <h:outputText value="#{dataverseUserBundle.toLeaveFeedbackText}" />
                                     </ui:fragment>
                                     <h:outputText value="#{item.sendDate}" style="color:#999999; margin-left:1em; font-size:.85em;"/>
                                     <!--<h:outputText value="Read " style="color: green" rendered="#{item.displayAsRead}" />
                                     <h:outputText value="Unread " style="color: red" rendered="#{!item.displayAsRead}" />-->
-                                    <h:commandLink action="#{DataverseUserPage.remove(item.id)}" title="Remove notification" styleClass="pull-right">
+                                    <h:commandLink action="#{DataverseUserPage.remove(item.id)}" title="#{dataverseUserBundle.removeNotificationText}" styleClass="pull-right">
                                         <span class="glyphicon glyphicon-remove"></span>
                                     </h:commandLink>
                                 </div>
@@ -151,16 +153,16 @@
                     </p:tabView>
 
                     <p:tabView id="tabView1" rendered="#{!empty DataverseUserPage.editMode}">
-                        <p:tab id="accountInfo" title="Account Information">
+                        <p:tab id="accountInfo" title="#{dataverseUserBundle.accountInformationText}">
                             <div class="clearfix" style="padding-bottom:.75em; border-bottom:1px solid #DDDDDD;">
                                 <div>
                                     <style type="text/css">
                                         .panelgridFormTable tr, .panelgridFormTable td {border:0;}
                                     </style>
                                     <p:panelGrid columns="2" styleClass="panelgridFormTable">
-                                        <p:outputLabel value="Username *" for="userName" rendered="#{DataverseUserPage.editMode == 'CREATE'}" />
-                                        <p:outputLabel value="Username" for="userName" rendered="#{DataverseUserPage.editMode == 'EDIT' or empty DataverseUserPage.editMode}" />
-                                        <p:outputLabel value="Usuername/Email:  " rendered="#{DataverseUserPage.editMode == 'FORGOT'}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.userNameText} *" for="userName" rendered="#{DataverseUserPage.editMode == 'CREATE'}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.userNameText}" for="userName" rendered="#{DataverseUserPage.editMode == 'EDIT' or empty DataverseUserPage.editMode}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.userNameText}/#{dataverseUserBundle.emailText}:  " rendered="#{DataverseUserPage.editMode == 'FORGOT'}" />
                                         <ui:fragment rendered="#{DataverseUserPage.editMode != 'CHANGE'}">
                                             <h:outputText value="#{DataverseUserPage.dataverseUser.userName}" rendered="#{empty DataverseUserPage.editMode}" />
                                             <p:panelGrid columns="2" rendered="#{!empty DataverseUserPage.editMode}">
@@ -171,34 +173,34 @@
                                             </p:panelGrid>
                                         </ui:fragment>
 
-                                        <h:outputLabel value="Current Password *" for="currentPassword" rendered="#{DataverseUserPage.editMode == 'CHANGE'}" />
+                                        <h:outputLabel value="#{dataverseUserBundle.currentPasswdText} *" for="currentPassword" rendered="#{DataverseUserPage.editMode == 'CHANGE'}" />
                                         <ui:fragment rendered="#{DataverseUserPage.editMode == 'CHANGE'}">
                                             <p:panelGrid columns="2">
-                                                <p:password id="currentPassword" validator="#{DataverseUserPage.validatePassword}" label="Current Password" value="#{DataverseUserPage.currentPassword}" />
+                                                <p:password id="currentPassword" validator="#{DataverseUserPage.validatePassword}" label="#{dataverseUserBundle.currentPasswdText}" value="#{DataverseUserPage.currentPassword}" />
                                                 <p:message for="currentPassword" />
                                             </p:panelGrid>
                                         </ui:fragment>
 
-                                        <h:outputLabel value="Password *" for="inputPassword" rendered="#{DataverseUserPage.editMode == 'CREATE'}" />
-                                        <h:outputLabel value="New Password *" for="inputPassword" rendered="#{DataverseUserPage.editMode == 'CHANGE'}" />
+                                        <h:outputLabel value="#{dataverseUserBundle.passwdText} *" for="inputPassword" rendered="#{DataverseUserPage.editMode == 'CREATE'}" />
+                                        <h:outputLabel value="#{dataverseUserBundle.newPasswdText} *" for="inputPassword" rendered="#{DataverseUserPage.editMode == 'CHANGE'}" />
                                         <ui:fragment rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'CHANGE'}">
                                             <p:panelGrid columns="2">
-                                                <p:password id="inputPassword" label="Password" match="retypePassword" value="#{DataverseUserPage.inputPassword}" />
+                                                <p:password id="inputPassword" label="#{dataverseUserBundle.passwdText}" match="retypePassword" value="#{DataverseUserPage.inputPassword}" />
                                                 <p:message for="inputPassword" />
                                             </p:panelGrid>
                                         </ui:fragment>
 
-                                        <h:outputLabel value="Retype Password *" for="retypePassword" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'CHANGE'}" />
+                                        <h:outputLabel value="#{dataverseUserBundle.retypePasswdText} *" for="retypePassword" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'CHANGE'}" />
                                         <ui:fragment rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'CHANGE'}">
                                             <p:panelGrid columns="2">
-                                                <p:password id="retypePassword" label="Retype Password" value="#{DataverseUserPage.inputPassword}" />
+                                                <p:password id="retypePassword" label="#{dataverseUserBundle.retypePasswdText}" value="#{DataverseUserPage.inputPassword}" />
                                                 <p:message for="retypePassword" />
                                             </p:panelGrid>
                                         </ui:fragment>
 
-                                        <p:outputLabel value="First Name *" for="firstName" rendered="#{DataverseUserPage.editMode == 'CREATE'}" />
-                                        <p:outputLabel value="First Name" for="firstName" rendered="#{DataverseUserPage.editMode == 'EDIT'}" />
-                                        <p:outputLabel value="Name" rendered="#{empty DataverseUserPage.editMode}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.firstNameText} *" for="firstName" rendered="#{DataverseUserPage.editMode == 'CREATE'}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.firstNameText}" for="firstName" rendered="#{DataverseUserPage.editMode == 'EDIT'}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.firstNameText}" rendered="#{empty DataverseUserPage.editMode}" />
                                         <ui:fragment rendered="#{empty DataverseUserPage.editMode or DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                             <h:outputText value="#{DataverseUserPage.dataverseUser.firstName} #{DataverseUserPage.dataverseUser.lastName}" rendered="#{empty DataverseUserPage.editMode}" />
                                             <p:panelGrid columns="2" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
@@ -207,8 +209,8 @@
                                             </p:panelGrid>
                                         </ui:fragment>
 
-                                        <p:outputLabel value="Last Name *" for="lastName" rendered="#{DataverseUserPage.editMode == 'CREATE'}" />
-                                        <p:outputLabel value="Last Name" for="lastName" rendered="#{DataverseUserPage.editMode == 'EDIT'}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.lastNameText} *" for="lastName" rendered="#{DataverseUserPage.editMode == 'CREATE'}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.firstNameText}" for="lastName" rendered="#{DataverseUserPage.editMode == 'EDIT'}" />
                                         <ui:fragment rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                             <p:panelGrid columns="2">
                                                 <p:inputText id="lastName" value="#{DataverseUserPage.dataverseUser.lastName}" />
@@ -216,8 +218,8 @@
                                             </p:panelGrid>
                                         </ui:fragment>
 
-                                        <p:outputLabel value="Email *" for="email" rendered="#{DataverseUserPage.editMode == 'CREATE'}" />
-                                        <p:outputLabel value="Email" for="email" rendered="#{DataverseUserPage.editMode == 'EDIT' or empty DataverseUserPage.editMode}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.emailText} *" for="email" rendered="#{DataverseUserPage.editMode == 'CREATE'}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.emailText}" for="email" rendered="#{DataverseUserPage.editMode == 'EDIT' or empty DataverseUserPage.editMode}" />
                                         <ui:fragment rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT' or empty DataverseUserPage.editMode}">
                                             <h:outputText value="#{DataverseUserPage.dataverseUser.email}" rendered="#{empty DataverseUserPage.editMode}" />
                                             <p:panelGrid columns="2" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
@@ -226,7 +228,7 @@
                                             </p:panelGrid>
                                         </ui:fragment>
 
-                                        <p:outputLabel value="Affiliation" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT' or empty DataverseUserPage.editMode}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.affiliationText}" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT' or empty DataverseUserPage.editMode}" />
                                         <ui:fragment rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT' or empty DataverseUserPage.editMode}">
                                             <h:outputText value="#{DataverseUserPage.dataverseUser.affiliation}" rendered="#{empty DataverseUserPage.editMode}" />
                                             <p:panelGrid columns="2" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
@@ -235,7 +237,7 @@
                                             </p:panelGrid>
                                         </ui:fragment>
 
-                                        <p:outputLabel value="Position" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT' or empty DataverseUserPage.editMode}" />
+                                        <p:outputLabel value="#{dataverseUserBundle.positionText}" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT' or empty DataverseUserPage.editMode}" />
                                         <ui:fragment rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT' or empty DataverseUserPage.editMode}">
                                             <h:outputText value="#{DataverseUserPage.dataverseUser.position}" rendered="#{empty DataverseUserPage.editMode}" />
                                             <p:panelGrid columns="2" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
@@ -247,9 +249,9 @@
                                 </div>
                                 <p:panel styleClass="panelLayoutButtonBlock" rendered="#{!empty DataverseUserPage.editMode}">
                                     <ui:fragment>
-                                        <p:commandButton id="save" value="#{DataverseUserPage.editMode == 'CREATE'?'Create Account':'Save Changes'}" action="#{DataverseUserPage.save}" update="@all" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT' or DataverseUserPage.editMode == 'CHANGE'}" />
-                                        <p:commandButton id="submit" value="Submit" actionListener="#{DataverseUserPage.submit}" update="@all" rendered="#{DataverseUserPage.editMode == 'FORGOT'}" />
-                                        <p:commandButton id="cancel" value="Cancel" action="#{DataverseUserPage.cancel}" process="@this" update="@all" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT' or DataverseUserPage.editMode == 'CHANGE' or DataverseUserPage.editMode == 'FORGOT'}">
+                                        <p:commandButton id="save" value="#{DataverseUserPage.editMode == 'CREATE'?dataverseUserBundle.createAccountButton:dataverseUserBundle.saveChangesButton}" action="#{DataverseUserPage.save}" update="@all" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT' or DataverseUserPage.editMode == 'CHANGE'}" />
+                                        <p:commandButton id="submit" value="#{dataverseUserBundle.sumbitButton}" actionListener="#{DataverseUserPage.submit}" update="@all" rendered="#{DataverseUserPage.editMode == 'FORGOT'}" />
+                                        <p:commandButton id="cancel" value="#{dataverseUserBundle.cancelButton}" action="#{DataverseUserPage.cancel}" process="@this" update="@all" rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT' or DataverseUserPage.editMode == 'CHANGE' or DataverseUserPage.editMode == 'FORGOT'}">
                                             <p:resetInput target="@all" />
                                         </p:commandButton>
                                     </ui:fragment>

From 230c0c18a7e26d063b4c10b175bb154e80ed68af Mon Sep 17 00:00:00 2001
From: dataverse <dataverse@localhost>
Date: Thu, 26 Jun 2014 17:50:12 +0800
Subject: [PATCH 02/13]

---
 src/main/java/DataverseUserBundle.properties | 57 ++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 src/main/java/DataverseUserBundle.properties

diff --git a/src/main/java/DataverseUserBundle.properties b/src/main/java/DataverseUserBundle.properties
new file mode 100644
index 00000000000..d7e38b825ec
--- /dev/null
+++ b/src/main/java/DataverseUserBundle.properties
@@ -0,0 +1,57 @@
+# dataverseuser.xhtml
+#
+
+#pageTitle
+pageTitle=User
+
+
+#the Edit Account button
+editAccountButton=Edit Account
+accountInformationText=Account Information
+passwdText=Password
+
+
+#msgs about losting password
+lostPasswdMsg=If you have lost or forgotten your password, please enter your username or email address below and click Submit. We will send you an e-mail with your new password.
+
+
+#data related to me tab and Notifications tab
+dataRelatedToMeTab=Data Related To Me
+notificationsTab=Notifications
+
+
+#msgs about notifications
+wasCreatedInText=,was created in 
+wasAddedToText=, was added to 
+toPublishText=. Don't forget to publish it!
+welcomeToDataverseText=Welcome to Dataverse 4.0 Beta! Please take a look around, try everything out, and check out our 
+googleGroupText= Google Group 
+toLeaveFeedbackText= to leave feedback.
+removeNotificationText=Remove notification
+
+
+#sign up , edit Account and change password
+userNameText=Username
+retypePasswdText=Retype Password
+firstNameText=First Name
+lastNameText=Last Name
+emailText=Email
+affiliationText=Affiliation
+positionText=Position
+
+currentPasswdText=Current Password
+newPasswdText=New Password
+
+submitButton=Submit
+cancelButton=Cancel
+
+createAccountButton=Create Account
+saveChangesButton=Save Changes
+
+
+
+
+
+
+
+

From 52f975e893358534c200ac1d2279b028cd1b771b Mon Sep 17 00:00:00 2001
From: dataverse <dataverse@localhost>
Date: Thu, 26 Jun 2014 18:22:47 +0800
Subject: [PATCH 03/13]

---
 src/main/webapp/WEB-INF/faces-config.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/webapp/WEB-INF/faces-config.xml b/src/main/webapp/WEB-INF/faces-config.xml
index 539867c273b..f5ede1a7eeb 100644
--- a/src/main/webapp/WEB-INF/faces-config.xml
+++ b/src/main/webapp/WEB-INF/faces-config.xml
@@ -10,4 +10,11 @@
             <renderer-class>edu.harvard.iq.dataverse.FileUploadRenderer</renderer-class>
         </renderer>
     </render-kit>
+    <application>
+        <locale-config>
+            <default-locale>en</default-locale>
+            <supported-locale>zh_CN</supported-locale>
+            <supported-locale>ja</supported-locale>
+        </locale-config>        
+    </application>
 </faces-config>
\ No newline at end of file

From cadb2c3e7db16bce55efbdad4291254d5a58eb66 Mon Sep 17 00:00:00 2001
From: jian881219 <>
Date: Mon, 7 Jul 2014 15:03:04 +0800
Subject: [PATCH 04/13]

---
 src/main/java/ValidationMessages.properties | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/main/java/ValidationMessages.properties

diff --git a/src/main/java/ValidationMessages.properties b/src/main/java/ValidationMessages.properties
new file mode 100644
index 00000000000..db03c542ac8
--- /dev/null
+++ b/src/main/java/ValidationMessages.properties
@@ -0,0 +1,4 @@
+# msgs from bean validator
+
+# from DataverseUserPage.java
+validator.notBlank=Please enter a password for your account.
\ No newline at end of file

From a8d164bcf2d4505ada188009ff264d660a739628 Mon Sep 17 00:00:00 2001
From: jian881219 <jian881219@gmail.com>
Date: Mon, 7 Jul 2014 15:03:23 +0800
Subject: [PATCH 05/13]

---
 src/main/java/DataverseUserBundle.properties | 24 +++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main/java/DataverseUserBundle.properties b/src/main/java/DataverseUserBundle.properties
index d7e38b825ec..1e5a6ec9b59 100644
--- a/src/main/java/DataverseUserBundle.properties
+++ b/src/main/java/DataverseUserBundle.properties
@@ -1,26 +1,27 @@
-# dataverseuser.xhtml
+# Internationalization for dataverseuser.xhtml and DataverseUserPage.java
 #
 
-#pageTitle
-pageTitle=User
+# for dataverseuser.xhtml
+# pageTitle
+pageTitleText=User
 
 
-#the Edit Account button
+# the Edit Account button
 editAccountButton=Edit Account
 accountInformationText=Account Information
 passwdText=Password
 
 
-#msgs about losting password
+# msgs about losting password
 lostPasswdMsg=If you have lost or forgotten your password, please enter your username or email address below and click Submit. We will send you an e-mail with your new password.
 
 
-#data related to me tab and Notifications tab
+# data related to me tab and Notifications tab
 dataRelatedToMeTab=Data Related To Me
 notificationsTab=Notifications
 
 
-#msgs about notifications
+# msgs about notifications
 wasCreatedInText=,was created in 
 wasAddedToText=, was added to 
 toPublishText=. Don't forget to publish it!
@@ -30,7 +31,7 @@ toLeaveFeedbackText= to leave feedback.
 removeNotificationText=Remove notification
 
 
-#sign up , edit Account and change password
+# sign up , edit Account and change password
 userNameText=Username
 retypePasswdText=Retype Password
 firstNameText=First Name
@@ -50,6 +51,13 @@ saveChangesButton=Save Changes
 
 
 
+# for DataverseUserPage.java
+
+usernameIsTakenMsg=This Username is already taken.
+usernameOrEmailisIncorrectMsg=Username or Email is incorrect.
+passwdIsIncorrectMsg=Password is incorrect.
+
+
 
 
 

From 739e5d62bae08e9143d22c853cf42d37fc62ba2b Mon Sep 17 00:00:00 2001
From: jian881219 <jian881219@gmail.com>
Date: Mon, 7 Jul 2014 15:03:47 +0800
Subject: [PATCH 06/13]

---
 .../edu/harvard/iq/dataverse/DataverseUserPage.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseUserPage.java b/src/main/java/edu/harvard/iq/dataverse/DataverseUserPage.java
index 7b262127f31..4e650e72bd2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseUserPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseUserPage.java
@@ -20,6 +20,7 @@
 import javax.inject.Named;
 import org.hibernate.validator.constraints.NotBlank;
 import org.primefaces.event.TabChangeEvent;
+import java.util.ResourceBundle;
 
 /**
  *
@@ -50,10 +51,10 @@ public enum EditMode {
     private DataverseUser dataverseUser;
     private EditMode editMode;
 
-    @NotBlank(message = "Please enter a password for your account.")
+    @NotBlank(message = "{validator.notBlank}")
     private String inputPassword;
 
-    @NotBlank(message = "Please enter a password for your account.")
+    @NotBlank(message = "{validator.notBlank}")
     private String currentPassword;
     private Long dataverseId;
     private String permissionType;
@@ -61,6 +62,8 @@ public enum EditMode {
     private List<UserNotification> notificationsList;
     private int activeIndex;
     private String selectTab = "somedata";
+    
+    ResourceBundle resourceBundlePageInfo=ResourceBundle.getBundle("DataverseUserBundle");
 
     public DataverseUser getDataverseUser() {
         if (dataverseUser == null) {
@@ -198,7 +201,7 @@ public void validateUserName(FacesContext context, UIComponent toValidate, Objec
         }
         if (userNameFound) {
             ((UIInput) toValidate).setValid(false);
-            FacesMessage message = new FacesMessage("This Username is already taken.");
+            FacesMessage message = new FacesMessage(resourceBundlePageInfo.getString("usernameIsTakenMsg"));
             context.addMessage(toValidate.getClientId(context), message);
         }
     }
@@ -217,7 +220,7 @@ public void validateUserNameEmail(FacesContext context, UIComponent toValidate,
         }
         if (!userNameFound) {
             ((UIInput) toValidate).setValid(false);
-            FacesMessage message = new FacesMessage("Username or Email is incorrect.");
+            FacesMessage message = new FacesMessage(resourceBundlePageInfo.getString("usernameOrEmailisIncorrectMsg"));
             context.addMessage(toValidate.getClientId(context), message);
         }
     }
@@ -227,7 +230,7 @@ public void validatePassword(FacesContext context, UIComponent toValidate, Objec
         String encryptedPassword = PasswordEncryption.getInstance().encrypt(password);
         if (!encryptedPassword.equals(dataverseUser.getEncryptedPassword())) {
             ((UIInput) toValidate).setValid(false);
-            FacesMessage message = new FacesMessage("Password is incorrect.");
+            FacesMessage message = new FacesMessage(resourceBundlePageInfo.getString("passwdIsIncorrectMsg"));
             context.addMessage(toValidate.getClientId(context), message);
         }
     }

From ca3ecbdf5121d47e6cdb991062216dfb1ee48aec Mon Sep 17 00:00:00 2001
From: jian881219 <jian881219@gmail.com>
Date: Wed, 9 Jul 2014 09:31:45 +0800
Subject: [PATCH 07/13]

---
 src/main/webapp/dataverseuser.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index 6c57f402e0c..e1af654f10f 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -11,7 +11,7 @@
     <h:body>
         <ui:composition template="/dataverse_template.xhtml">
             <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>
-            <ui:param name="pageTitle" value="#{dataverseUserBundle.pageTitle}"/>
+            <ui:param name="pageTitle" value="#{dataverseUserBundle.pageTitleText}"/>
             <ui:param name="dataverse" value="#{dataverseServiceBean.findRootDataverse()}"/>
             <ui:param name="showDataverseHeader" value="false"/>
             <ui:param name="showBreadcrumbs" value="false"/>

From 17aacf862644c7cec6d7a9a2a775c0820a3ec626 Mon Sep 17 00:00:00 2001
From: jian881219 <jian881219@gmail.com>
Date: Wed, 9 Jul 2014 09:36:17 +0800
Subject: [PATCH 08/13]

---
 src/main/webapp/dataverseuser.xhtml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index e1af654f10f..aa0dc4ba2eb 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -11,6 +11,8 @@
     <h:body>
         <ui:composition template="/dataverse_template.xhtml">
             <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>
+            <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/><f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>
+            
             <ui:param name="pageTitle" value="#{dataverseUserBundle.pageTitleText}"/>
             <ui:param name="dataverse" value="#{dataverseServiceBean.findRootDataverse()}"/>
             <ui:param name="showDataverseHeader" value="false"/>

From 7b2cb13afc29f786fa8f3f458c9f4efb9daf2361 Mon Sep 17 00:00:00 2001
From: jian881219 <jian881219@gmail.com>
Date: Wed, 9 Jul 2014 09:41:45 +0800
Subject: [PATCH 09/13]

---
 src/main/webapp/dataverseuser.xhtml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index aa0dc4ba2eb..462f44db4d5 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -10,12 +10,11 @@
 
     <h:body>
         <ui:composition template="/dataverse_template.xhtml">
-            <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>
-            <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/><f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>
-            
+            <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>                       
             <ui:param name="pageTitle" value="#{dataverseUserBundle.pageTitleText}"/>
             <ui:param name="dataverse" value="#{dataverseServiceBean.findRootDataverse()}"/>
             <ui:param name="showDataverseHeader" value="false"/>
+            <ui:param name="showDataverseHeader" value="false"/>
             <ui:param name="showBreadcrumbs" value="false"/>
             <ui:define name="body">
                 <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>

From 08798d8f960646af514e2e54fd09f5c81e322602 Mon Sep 17 00:00:00 2001
From: jian881219 <jian881219@gmail.com>
Date: Wed, 9 Jul 2014 09:42:47 +0800
Subject: [PATCH 10/13]

---
 src/main/webapp/dataverseuser.xhtml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index 462f44db4d5..9d09a39d400 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -13,8 +13,7 @@
             <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>                       
             <ui:param name="pageTitle" value="#{dataverseUserBundle.pageTitleText}"/>
             <ui:param name="dataverse" value="#{dataverseServiceBean.findRootDataverse()}"/>
-            <ui:param name="showDataverseHeader" value="false"/>
-            <ui:param name="showDataverseHeader" value="false"/>
+            <ui:param name="showDataverseHeader" value="false"/>            
             <ui:param name="showBreadcrumbs" value="false"/>
             <ui:define name="body">
                 <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>

From f04124f254fce31cca03c1bec26fc0a3edc7c0dd Mon Sep 17 00:00:00 2001
From: jian881219 <jian881219@gmail.com>
Date: Wed, 9 Jul 2014 09:48:57 +0800
Subject: [PATCH 11/13]

---
 src/main/webapp/dataverseuser.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index 9d09a39d400..2879d9b1ae9 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -13,7 +13,7 @@
             <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>                       
             <ui:param name="pageTitle" value="#{dataverseUserBundle.pageTitleText}"/>
             <ui:param name="dataverse" value="#{dataverseServiceBean.findRootDataverse()}"/>
-            <ui:param name="showDataverseHeader" value="false"/>            
+            <ui:param name="showDataverseHeader" value="false"/>
             <ui:param name="showBreadcrumbs" value="false"/>
             <ui:define name="body">
                 <f:loadBundle basename="DataverseUserBundle" var="dataverseUserBundle"/>

From a8d00493c7f51e8a738380982e19bb8304764a8e Mon Sep 17 00:00:00 2001
From: jian881219 <jian881219@gmail.com>
Date: Wed, 9 Jul 2014 09:53:22 +0800
Subject: [PATCH 12/13]

---
 src/main/java/edu/harvard/iq/dataverse/DataverseUserPage.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseUserPage.java b/src/main/java/edu/harvard/iq/dataverse/DataverseUserPage.java
index 4e650e72bd2..73f556c3b2b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseUserPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseUserPage.java
@@ -51,10 +51,10 @@ public enum EditMode {
     private DataverseUser dataverseUser;
     private EditMode editMode;
 
-    @NotBlank(message = "{validator.notBlank}")
+    @NotBlank(message = "{validator.enterPasswdMsg}")
     private String inputPassword;
 
-    @NotBlank(message = "{validator.notBlank}")
+    @NotBlank(message = "{validator.enterPasswdMsg}")
     private String currentPassword;
     private Long dataverseId;
     private String permissionType;

From feb6847c634c70ab1315742b24c434ec90634b63 Mon Sep 17 00:00:00 2001
From: jian881219 <jian881219@gmail.com>
Date: Wed, 9 Jul 2014 09:53:34 +0800
Subject: [PATCH 13/13]

---
 src/main/java/ValidationMessages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ValidationMessages.properties b/src/main/java/ValidationMessages.properties
index db03c542ac8..cfe2cf57fce 100644
--- a/src/main/java/ValidationMessages.properties
+++ b/src/main/java/ValidationMessages.properties
@@ -1,4 +1,4 @@
 # msgs from bean validator
 
 # from DataverseUserPage.java
-validator.notBlank=Please enter a password for your account.
\ No newline at end of file
+validator.enterPasswdMsg=Please enter a password for your account.
\ No newline at end of file