Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Linnea Samila
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 16b912b5
authored
Mar 20, 2010
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
:)
1 parent
04c7e377
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
5 deletions
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java
code/LanBortalWeb/src/resources/i18n.properties
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java
View file @
16b912b
...
...
@@ -114,6 +114,14 @@ public class User implements ModelInterface {
@Lob
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"
)
private
List
<
Vote
>
votes
;
...
...
@@ -480,4 +488,32 @@ public class User implements ModelInterface {
public
List
<
AccountEvent
>
getSoldItems
()
{
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
;
}
}
code/LanBortalWeb/src/resources/i18n.properties
View file @
16b912b
user.username
=
K
yttj
tunnus
user.username
=
K
\u
00E4ytt
\u
00E4j
\u
00E4
tunnus
user.realname
=
Nimi
user.password
=
Salasana
user.email
=
S
hk
postiosoite
user.email
=
S
\u
00E4hk
\u
00F6
postiosoite
user.phone
=
Puhelinnumero
user.bankaccount
=
Tilinumero
user.bank
=
Pankki
save
=
Tallenna
cancel
=
Peruuta
login.username
=
K
yttj
tunnus:
login.username
=
K
\u
00E4ytt
\u
00E4j
\u
00E4
tunnus:
login.password
=
Salasana:
login.submit
=
Kirjaudu sisn
login.submit
=
Kirjaudu sis
\u
00E4
\u
00E4
n
user.validate.notUniqueUsername
=
i18n K
yttjtunnus on jo olemassa. Ole hyv
ja valitse toinen tunnus.
user.validate.notUniqueUsername
=
i18n K
\u
00E4ytt
\u
00E4j
\u
00E4tunnus on jo olemassa. Ole hyv
\u
00E4
ja valitse toinen tunnus.
fallbackstr
=
"fallback default"
teststr
=
default locale test
defaultstr
=
"Something default..."
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment