Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Antti Väyrynen
/
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 b55391b1
authored
Dec 07, 2014
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
litlle changes
1 parent
fa2abd9f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
7 deletions
code/moya-web/WebContent/resources/cditools/user/create.xhtml
code/moya-web/WebContent/resources/templates/primelayout/template.xhtml
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
code/moya-web/WebContent/resources/cditools/user/create.xhtml
View file @
b55391b
...
...
@@ -88,7 +88,7 @@
</tr>
<tr>
<td
colspan=
"2"
>
<p:outputLabel
value=
"
*
#{i18n['user.emailAndUsername']}"
for=
"email"
/>
<p:outputLabel
value=
"#{i18n['user.emailAndUsername']}"
for=
"email"
/>
<br
/>
<p:inputText
validator=
"#{userValidator.validateEmail}"
size=
"45"
id=
"email"
disabled=
"#{!cc.attrs.creating and !userView.canSave}"
value=
"#{userView.selectedUser.email}"
required=
"true"
requiredMessage=
"#{i18n['required']}"
/>
<p:message
for=
"email"
/>
...
...
code/moya-web/WebContent/resources/templates/primelayout/template.xhtml
View file @
b55391b
...
...
@@ -123,7 +123,7 @@
</p:layoutUnit>
<p:layoutUnit
header=
"#{i18n['menu']}"
collapsible=
"true"
id=
"leftpanel"
position=
"west"
resizable=
"true"
size=
"2
00
"
minSize=
"100"
>
<p:layoutUnit
header=
"#{i18n['menu']}"
collapsible=
"true"
id=
"leftpanel"
position=
"west"
resizable=
"true"
size=
"2
25
"
minSize=
"100"
>
<p:fieldset
rendered=
"#{sessionHandler.loggedIn}"
>
<h:outputText
value=
"#{i18n['template.loggedInAs']}"
/>
...
...
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
View file @
b55391b
...
...
@@ -423,3 +423,5 @@ user.emailAgain=S\u00E4hk\u00F6posti (uudelleen)
user.email
=
S
\u
00E4hk
\u
00F6postiosoite
required
=
Arvo vaaditaan
user.createdmessage
=
K
\u
00E4ytt
\u
00E4j
\u
00E4tunnus on luotu onnistuneesti.
product.vat
=
ALV-%
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT
=
Luo uusi paikka ostettaessa
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
View file @
b55391b
...
...
@@ -325,7 +325,7 @@ discount.details = Details
discount.edit
=
Edit
discount.maxNum
=
Max nr of discounts
discount.perUser
=
Discounts per user
discount.percentage
=
Discount
percent
discount.percentage
=
Discount
multiplier
discount.products
=
Products
discount.role
=
Role discount
discount.save
=
Save
...
...
@@ -967,7 +967,7 @@ product.shopInstant = Create automatic cashpayment
product.sort
=
Sort nr
product.totalPrice
=
Total
product.unitName
=
Unit name
product.vat
=
VAT-%
(0.0 - 0.99)
product.vat
=
VAT-%
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT
=
Create new place bought
productFlag.HIDE_FROM_INFOSHOP
=
Hide from info shop
...
...
@@ -1564,7 +1564,7 @@ userview.oldPasswordError = Invalid password!
userview.passwordTooShort
=
Password has to be atleast {0} characters long
\!
userview.passwordsChanged
=
Password changed
userview.passwordsDontMatch
=
Passwords do not match! Please try again!
userview.userExists
=
Username already exists! You may already have an account.
userview.userExists
=
Username already exists
\
!
You may already have an account.
viewexpired.body
=
Please login again.
viewexpired.title
=
Login expired. Please login again.
...
...
@@ -1621,3 +1621,4 @@ user.emailtooshortmessage=Email must be atleast {0} characters long.
user.emailsunmatch
=
Email addresses does not match.
user.emailAgain
=
Email (again)
required
=
Required
usercart.showoverview
=
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
View file @
b55391b
...
...
@@ -326,7 +326,7 @@ discount.details = Tiedot
discount.edit
=
Muokkaa
discount.maxNum
=
Alennusten enimm
\u
00E4islkm
discount.perUser
=
Alennuksia per k
\u
00E4ytt
\u
00E4j
\u
00E4
discount.percentage
=
Alennus
prosentti
discount.percentage
=
Alennus
kerroin
discount.products
=
Tuotteet
discount.role
=
Roolialennus
discount.save
=
Tallenna
...
...
@@ -950,7 +950,7 @@ product.shopInstant = Luo k\u00E4teismaksu tuotteille
product.sort
=
J
\u
00E4rjestys luku
product.totalPrice
=
Summa
product.unitName
=
Tuoteyksikk
\u
00F6
product.vat
=
ALV-%
(0.0 - 0.99)
product.vat
=
ALV-%
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT
=
Luo uusi paikka ostettaessa
productFlag.HIDE_FROM_INFOSHOP
=
Piilota infon kaupasta
...
...
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