Commit 16b912b5 by Tuukka Kivilahti

:)

1 parent 04c7e377
...@@ -114,6 +114,14 @@ public class User implements ModelInterface { ...@@ -114,6 +114,14 @@ public class User implements ModelInterface {
@Lob @Lob
private String login; private String login;
@Column(name = "confirm_hash")
@Lob
private String confirmHash;
@Column(name = "confirm_time")
@Temporal(TemporalType.TIMESTAMP)
private Calendar confirmTime;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "voter") @OneToMany(cascade = CascadeType.ALL, mappedBy = "voter")
private List<Vote> votes; private List<Vote> votes;
...@@ -480,4 +488,32 @@ public class User implements ModelInterface { ...@@ -480,4 +488,32 @@ public class User implements ModelInterface {
public List<AccountEvent> getSoldItems() { public List<AccountEvent> getSoldItems() {
return soldItems; return soldItems;
} }
/**
* @return the confirmHash
*/
public String getConfirmHash() {
return confirmHash;
}
/**
* @param confirmHash the confirmHash to set
*/
public void setConfirmHash(String confirmHash) {
this.confirmHash = confirmHash;
}
/**
* @return the confirmTime
*/
public Calendar getConfirmTime() {
return confirmTime;
}
/**
* @param confirmTime the confirmTime to set
*/
public void setConfirmTime(Calendar confirmTime) {
this.confirmTime = confirmTime;
}
} }
user.username=Kyttjtunnus user.username=K\u00E4ytt\u00E4j\u00E4tunnus
user.realname=Nimi user.realname=Nimi
user.password=Salasana user.password=Salasana
user.email=Shkpostiosoite user.email=S\u00E4hk\u00F6postiosoite
user.phone=Puhelinnumero user.phone=Puhelinnumero
user.bankaccount=Tilinumero user.bankaccount=Tilinumero
user.bank=Pankki user.bank=Pankki
save=Tallenna save=Tallenna
cancel=Peruuta cancel=Peruuta
login.username=Kyttjtunnus: login.username=K\u00E4ytt\u00E4j\u00E4tunnus:
login.password=Salasana: login.password=Salasana:
login.submit=Kirjaudu sisn login.submit=Kirjaudu sis\u00E4\u00E4n
user.validate.notUniqueUsername=i18n Kyttjtunnus on jo olemassa. Ole hyv ja valitse toinen tunnus. user.validate.notUniqueUsername=i18n K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus.
fallbackstr="fallback default" fallbackstr="fallback default"
teststr=default locale test teststr=default locale test
defaultstr="Something default..." defaultstr="Something default..."
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!