Commit b55391b1 by Tuukka Kivilahti

litlle changes

1 parent fa2abd9f
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<p:outputLabel value="* #{i18n['user.emailAndUsername']}" for="email" /> <p:outputLabel value="#{i18n['user.emailAndUsername']}" for="email" />
<br /> <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: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" /> <p:message for="email" />
......
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
</p:layoutUnit> </p:layoutUnit>
<p:layoutUnit header="#{i18n['menu']}" collapsible="true" id="leftpanel" position="west" resizable="true" size="200" minSize="100" > <p:layoutUnit header="#{i18n['menu']}" collapsible="true" id="leftpanel" position="west" resizable="true" size="225" minSize="100" >
<p:fieldset rendered="#{sessionHandler.loggedIn}"> <p:fieldset rendered="#{sessionHandler.loggedIn}">
<h:outputText value="#{i18n['template.loggedInAs']}" /> <h:outputText value="#{i18n['template.loggedInAs']}" />
......
...@@ -423,3 +423,5 @@ user.emailAgain=S\u00E4hk\u00F6posti (uudelleen) ...@@ -423,3 +423,5 @@ user.emailAgain=S\u00E4hk\u00F6posti (uudelleen)
user.email=S\u00E4hk\u00F6postiosoite user.email=S\u00E4hk\u00F6postiosoite
required=Arvo vaaditaan required=Arvo vaaditaan
user.createdmessage=K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistuneesti. user.createdmessage=K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistuneesti.
product.vat=ALV-%
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT=Luo uusi paikka ostettaessa
...@@ -325,7 +325,7 @@ discount.details = Details ...@@ -325,7 +325,7 @@ discount.details = Details
discount.edit = Edit discount.edit = Edit
discount.maxNum = Max nr of discounts discount.maxNum = Max nr of discounts
discount.perUser = Discounts per user discount.perUser = Discounts per user
discount.percentage = Discount percent discount.percentage = Discount multiplier
discount.products = Products discount.products = Products
discount.role = Role discount discount.role = Role discount
discount.save = Save discount.save = Save
...@@ -967,7 +967,7 @@ product.shopInstant = Create automatic cashpayment ...@@ -967,7 +967,7 @@ product.shopInstant = Create automatic cashpayment
product.sort = Sort nr product.sort = Sort nr
product.totalPrice = Total product.totalPrice = Total
product.unitName = Unit name 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.CREATE_NEW_PLACE_WHEN_BOUGHT = Create new place bought
productFlag.HIDE_FROM_INFOSHOP = Hide from info shop productFlag.HIDE_FROM_INFOSHOP = Hide from info shop
...@@ -1564,7 +1564,7 @@ userview.oldPasswordError = Invalid password! ...@@ -1564,7 +1564,7 @@ userview.oldPasswordError = Invalid password!
userview.passwordTooShort = Password has to be atleast {0} characters long\! userview.passwordTooShort = Password has to be atleast {0} characters long\!
userview.passwordsChanged = Password changed userview.passwordsChanged = Password changed
userview.passwordsDontMatch = Passwords do not match! Please try again! 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.body = Please login again.
viewexpired.title = Login expired. Please login again. viewexpired.title = Login expired. Please login again.
...@@ -1621,3 +1621,4 @@ user.emailtooshortmessage=Email must be atleast {0} characters long. ...@@ -1621,3 +1621,4 @@ user.emailtooshortmessage=Email must be atleast {0} characters long.
user.emailsunmatch=Email addresses does not match. user.emailsunmatch=Email addresses does not match.
user.emailAgain=Email (again) user.emailAgain=Email (again)
required=Required required=Required
usercart.showoverview=
...@@ -326,7 +326,7 @@ discount.details = Tiedot ...@@ -326,7 +326,7 @@ discount.details = Tiedot
discount.edit = Muokkaa discount.edit = Muokkaa
discount.maxNum = Alennusten enimm\u00E4islkm discount.maxNum = Alennusten enimm\u00E4islkm
discount.perUser = Alennuksia per k\u00E4ytt\u00E4j\u00E4 discount.perUser = Alennuksia per k\u00E4ytt\u00E4j\u00E4
discount.percentage = Alennusprosentti discount.percentage = Alennuskerroin
discount.products = Tuotteet discount.products = Tuotteet
discount.role = Roolialennus discount.role = Roolialennus
discount.save = Tallenna discount.save = Tallenna
...@@ -950,7 +950,7 @@ product.shopInstant = Luo k\u00E4teismaksu tuotteille ...@@ -950,7 +950,7 @@ product.shopInstant = Luo k\u00E4teismaksu tuotteille
product.sort = J\u00E4rjestys luku product.sort = J\u00E4rjestys luku
product.totalPrice = Summa product.totalPrice = Summa
product.unitName = Tuoteyksikk\u00F6 product.unitName = Tuoteyksikk\u00F6
product.vat = ALV-% (0.0 - 0.99) product.vat = ALV-%
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Luo uusi paikka ostettaessa productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Luo uusi paikka ostettaessa
productFlag.HIDE_FROM_INFOSHOP = Piilota infon kaupasta productFlag.HIDE_FROM_INFOSHOP = Piilota infon kaupasta
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!