Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions src/main/java/DataverseUserBundle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Internationalization for dataverseuser.xhtml and DataverseUserPage.java
#

# for dataverseuser.xhtml
# pageTitle
pageTitleText=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



# for DataverseUserPage.java

usernameIsTakenMsg=This Username is already taken.
usernameOrEmailisIncorrectMsg=Username or Email is incorrect.
passwdIsIncorrectMsg=Password is incorrect.







4 changes: 4 additions & 0 deletions src/main/java/ValidationMessages.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# msgs from bean validator

# from DataverseUserPage.java
validator.enterPasswdMsg=Please enter a password for your account.
13 changes: 8 additions & 5 deletions src/main/java/edu/harvard/iq/dataverse/DataverseUserPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import javax.inject.Named;
import org.hibernate.validator.constraints.NotBlank;
import org.primefaces.event.TabChangeEvent;
import java.util.ResourceBundle;

/**
*
Expand Down Expand Up @@ -50,17 +51,19 @@ public enum EditMode {
private DataverseUser dataverseUser;
private EditMode editMode;

@NotBlank(message = "Please enter a password for your account.")
@NotBlank(message = "{validator.enterPasswdMsg}")
private String inputPassword;

@NotBlank(message = "Please enter a password for your account.")
@NotBlank(message = "{validator.enterPasswdMsg}")
private String currentPassword;
private Long dataverseId;
private String permissionType;
private List dataIdList;
private List<UserNotification> notificationsList;
private int activeIndex;
private String selectTab = "somedata";

ResourceBundle resourceBundlePageInfo=ResourceBundle.getBundle("DataverseUserBundle");

public DataverseUser getDataverseUser() {
if (dataverseUser == null) {
Expand Down Expand Up @@ -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);
}
}
Expand All @@ -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);
}
}
Expand All @@ -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);
}
}
Expand Down
7 changes: 7 additions & 0 deletions src/main/webapp/WEB-INF/faces-config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading