Skip to content

Codecrew / Moya

Go to a project
Commit 6f11ecfc by Antti Tönkyrä
Options

Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya into tournadmin

2 parents 72070f4e 00c8483c
Inline Side-by-side
Showing with 185 additions and 371 deletions
code/MoyaDatabase/src/fi/codecrew/moya/model/ProductLimitation.java
......@@ -20,6 +20,11 @@ public class ProductLimitation extends GenericEntity {
*/
private static final long serialVersionUID = 1373535658851118597L;
public ProductLimitationType[] getAvailableTypes()
{
return ProductLimitationType.values();
}
@Enumerated(EnumType.STRING)
@Column(nullable = false)
private ProductLimitationType type;
......@@ -109,4 +114,12 @@ public class ProductLimitation extends GenericEntity {
this.matchingRoles = matchingRoles;
}
public boolean getLast() {
return last;
}
public void setLast(boolean last) {
this.last = last;
}
}
code/MoyaWeb/WebContent/product/edit.xhtml
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:products="http://java.sun.com/jsf/composite/cditools/products"
>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:p="http://primefaces.org/ui">
<h:head>
<title></title>
......@@ -20,15 +18,13 @@
<products:edit commitaction="#{productView.saveProduct()}" commitvalue="#{i18n['products.save']}" />
<hr />
<h:form id="discounts">
<h:commandButton rendered="#{!empty productView.product.id}" action="#{productView.initCreateDiscount()}"
value="#{i18n['product.createDiscount']}"
>
<h:commandButton rendered="#{!empty productView.product.id}" action="#{productView.initCreateDiscount()}" value="#{i18n['product.createDiscount']}">
</h:commandButton>
<h:dataTable border="1" id="discount" value="#{productView.productDiscounts}" var="discount"
rendered="#{!empty productView.product.id and !empty productView.product.discounts}"
>
<h:dataTable border="1" id="discount" value="#{productView.productDiscounts}" var="discount" rendered="#{!empty productView.product.id and !empty productView.product.discounts}">
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['discount.percentage']}" />
......@@ -83,6 +79,27 @@
</h:dataTable>
</h:form>
<hr />
<h:form id="limits">
<h:commandButton rendered="#{!empty productView.product.id}" action="#{productView.initCreateLimit()}" value="#{i18n['product.createLimit']}">
</h:commandButton>
<p:dataTable border="1" id="discount" value="#{productView.productLimits}" var="limit" rendered="#{!empty productView.product.id and !empty productView.product.productLimits}">
<p:column rowHeader="#{i18n['productLimit.name']}">
<h:outputText value="#{limit.name}" />
</p:column>
<p:column rowHeader="#{i18n['productLimit.type']}">
<h:outputText value="#{limit.type}" />
</p:column>
<p:column rowHeader="#{i18n['productLimit.upperLimit']}">
<h:outputText value="#{limit.lowerLimit}" />
</p:column>
<p:column>
<p:commandButton ajax="false" action="#{productView.editLimit()}" value="#{i18n['productLimit.edit']}" />
</p:column>
</p:dataTable>
</h:form>
</ui:define>
</ui:composition>
</h:body>
......
code/MoyaWeb/WebContent/product/editLimit.xhtml 0 → 100644
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="#{sessionHandler.template}">
<ui:define name="content">
<h:form id="discountform">
<h:link id="back" outcome="/product/edit" value="#{i18n['product.returnProductEdit']} #{productView.product.name}">
<f:param name="productid" value="#{productView.product.id}" />
</h:link>
<p:panelGrid columns="3">
<p:outputLabel for="name" value="#{i18n['productLimit.name']}:" />
<p:inputText id="name" value="#{productView.limit.name}" />
<p:message for="name" />
<p:outputLabel for="description" value="#{i18n['productLimit.description']}:" />
<p:inputText id="description" value="#{productView.limit.description}" />
<p:message for="description" />
<p:outputLabel for="type" value="#{i18n['productLimit.type']}:" />
<p:selectOneMenu id="type" value="#{productView.limit.type}">
<f:selectItem itemValue="" itemLabel="---" />
<f:selectItems var="type" itemLabel="#{type}" itemDescription="#{i18n[type]}" value="#{productView.limit.availableTypes}" />
</p:selectOneMenu>
<p:message for="type" />
<p:outputLabel for="sort" value="#{i18n['productLimit.sort']}:" />
<p:inputText id="sort" value="#{productView.limit.sort}" />
<p:message for="sort" />
<p:outputLabel for="last" value="#{i18n['productLimit.last']}" />
<p:selectBooleanCheckbox id="last" value="#{productView.limit.last}" />
<p:message for="last" />
<p:outputLabel for="upperLimit" value="#{i18n['productLimit.upperLimit']}:" />
<p:inputText id="upperLimit" value="#{productView.limit.upperLimit}" />
<h:message for="upperLimit" />
<h:outputLabel for="lowerLimit" value="#{i18n['productLimit.lowerLimit']}:" />
<p:inputText id="lowerLimit" value="#{productView.limit.lowerLimit}" />
<h:message for="lowerLimit" />
<h:outputLabel for="roles" value="#{i18n['productLimit.roles']}:" />
<p:selectManyCheckbox layout="pageDirection" id="roles" value="#{productView.limit.matchingRoles}" converter="#{roleConverter}">
<f:selectItems var="role" itemLabel="#{role.name}" value="#{roleDataView.roleList}" />
</p:selectManyCheckbox>
<h:message for="roles" />
</p:panelGrid>
<p:commandButton id="commitbtn" action="#{productView.saveLimit}" value="#{i18n['productLimit.save']}" />
</h:form>
</ui:define>
</ui:composition>
</h:body>
</html>
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
#Sat Mar 30 17:56:44 EET 2013
actionlog.create.header = Create new actionmessage
actionlog.create.message = Message
actionlog.create.role = Target role
......@@ -15,7 +14,6 @@ actionlog.task = Task
actionlog.tasklist.header = Tasklist
actionlog.time = Time
actionlog.user = User
adduser.newphoto = Take new photo
adduser.newuser = Create new user
adduser.takePhoto = Take photo
......@@ -23,7 +21,6 @@ adduser.tostart = Back to start
adduser.update = Update profile picture
adduser.welcome = Welcome
adduser.welcometext = Here you can add new user or update your current user profile image. Please select desired action below.
bill.billAmount = Amount
bill.billNumber = Number
bill.cancel = Cancel bill
......@@ -33,9 +30,7 @@ bill.markPaid.show = Show Mark paid -buttons
bill.notes.title = Lis\u00E4tietoja
bill.save = Save
bill.showPayButtons = Show pay buttons
billine.vatp = vat-%
bortalApplication.BILL = Creating, and managing bills
bortalApplication.COMPO = Managing compos
bortalApplication.CONTENT = Product & shop management
......@@ -106,27 +101,17 @@ bortalApplication.user.VIEW_SELF = Can view
bortalApplication.user.VITUTTAAKO = Can send feedback
bortalApplication.user.WRITE_ORGROLES = Modify organization roles
bortalApplication.user.WRITE_ROLES = Modify roles
card.massprint.title = Print all
cardCode.code = Koodi
cardCode.type = Tyyppi
cardTemplate.emptyCardTemplate = ----
code.inputfield = Sy\u00F6t\u00E4 viivakoodi
create = Luo
delete = Poista
edit = Muokkaa
error = Virhe
error.contact = If this happens again, contact Info with the following code:
error.error = You have encountered an error.
event.domains.title = Domain
event.edit = Edit
event.endTime = End time
......@@ -138,18 +123,13 @@ event.properties.title = Properties
event.referenceNumberBase = Reference number base
event.save = Save
event.startTime = Start time
eventdomain.add = Add event domain
eventdomain.domainname = Domain
eventdomain.remove = Remove
eventmap.active = Active
eventorg.create = Create
foodWave.closeNow = Close now
foodWave.openNow = Open now
game.active = Aktiivinen
game.codecount = Avattuja
game.codes.available = Lisenssikoodit
......@@ -158,24 +138,19 @@ game.create = Create
game.edit = Edit
game.out = Gamecodes are out, pleace contact administration
game.product = Tuote
generic.sure.header = Confirmation
generic.sure.message = Are you sure?
generic.sure.no = No
generic.sure.yes = Yes
global.cancel = Cancel
global.copyright = Codecrew Ry
global.notAuthorizedExecute = You are not authorized to do that!!
global.notauthorized = You don't have enough rights to enter this site.
global.save = Save
httpsession.creationTime = Created
incomingView.attach = Liit\u00E4
incomingView.attachDialogTitle = Liit\u00E4 koodi k\u00E4ytt\u00E4j\u00E4\u00E4n
incomingView.cancel = Peruuta
incomingflow.alreadyShowingUser.message = Piipattu k\u00E4ytt\u00E4j\u00E4 on jo n\u00E4kyviss\u00E4
incomingflow.alreadyShowingUser.title = Valmiiksi valittu
incomingflow.cardCodes = Kortin koodit
......@@ -189,18 +164,15 @@ incomingflow.printedCard = Kortti
incomingflow.usereditor = K\u00E4ytt\u00E4j\u00E4
incomingflow.usereditor.info = Tiedot
incomingflow.usereditor.picture = Kuvanotto
lanEventPrivateProperty.defaultValue = Default value
lanEventPrivateProperty.editProperty = Edit property
lanEventPrivateProperty.save = Save
lanEventPrivateProperty.textValue = Text value
lanEventPrivateProperty.valueIsRawdataWarning = Raw value
lanEventProperty.booleanValue = Boolean value
lanEventProperty.defaultValue = Default value
lanEventProperty.save = Save
lanEventProperty.textValue = Text value
lecture.availableLectures = Aihealueen kurssit ja luennot
lecture.availableLecturesCalendar = Kalenterina
lecture.availableLecturesList = Listana
......@@ -224,7 +196,6 @@ lecture.saveLecture = Muokkaa
lecture.selectgroup = Valitse aihealue
lecture.startTime = Aloitusaika
lecture.unparticipate = Poista ilmoittautuminen
lectureGroup.createLectureGroup = Luo kurssikokonaisuus
lectureGroup.createNew = Luo uusi
lectureGroup.description = Kuvaus
......@@ -234,87 +205,61 @@ lectureGroup.saveLectureGroup = Muokkaa kurssikokonaisuutta
lectureGroup.selectCount = Montako kurssia saa valita
lectureGroup.selectCountUserInfo = Yhden osallistujan kiinti\u00F6
lectureGroup.view = Tarkastele
lecturegroup.create.success = Kurssiryhm\u00E4 luotu onnistuneesti.
lecturegroup.list.title = Luennot
lecturegroup.save.success = Kurssiryhm\u00E4 tallennettu onnistuneesti.
login.login = Login
login.logout = Logout
login.logoutmessage = You have logged out of the system
login.password = Password
login.submit = Login
login.username = Username
loginerror.header = Login failed
loginerror.message = Username of password incorrect.
loginerror.resetpassword = Reset password
map.id = #
navi.auth.login = frontpage
navi.auth.loginerror = frontpage
navi.auth.logout = frontpage
off = Poissa
on = P\u00E4\u00E4ll\u00E4
page.bill.billSummary.header = Summary of bills
page.bill.edit.header = Edit bill
page.bill.list.header = Bills
page.bill.listAll.header = Bills
page.bill.placemap.header = Place map
page.bill.show.header = Bill info
pagegroup.auth.login = frontpage
passwordChanged.body = You can now login with the new password.
passwordChanged.header = Password changed successfully.
passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator.
passwordReset.hashNotFound = Password change token has expired. Please send the query again.
permissiondenied.alreadyLoggedIn = You don't have enough rights
permissiondenied.header = Access denied
permissiondenied.notLoggedIn = You don't have enough rights to enter this site.
placegroupview.toptext = \
poll.edit = edit
print = Print
product.providedRole = Product defines role
product.returnProductEdit = Return to product:
product.saved = Product saved
productshop.minusOne = -1
productshop.minusTen = -10
productshop.plusOne = +1
productshop.plusTen = +10
reader.autopoll = Jatkuva lukijan seuraaminen
refresh = P\u00E4ivit\u00E4
registerleaflet.title = Rekisteriseloste
resetMail.header = Reset lost password
resetMail.username = Username
resetmailSent.body = Email has been sent containing a link where you can change the password.
resetmailSent.header = Email sent
role.userSelectableRole = K\u00E4ytt\u00E4j\u00E4n valittavissaoleva rooli
roleView.adduser = Lis\u00E4\u00E4 k\u00E4ytt\u00E4j\u00E4
roleView.hidePermissioneditor = Piilota oikeusasetukset
roleView.members = K\u00E4ytt\u00E4j\u00E4t
roleView.showPermissioneditor = N\u00E4yt\u00E4 oikeusasetukset
save = Tallenna
submenu.NotImplementedYet = Not implemented
submenu.admin.adduser = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
submenu.admin.adduser.index = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
......@@ -325,16 +270,12 @@ submenu.info.shop = Kauppa
submenu.lectureadmin.lectureParticipants = Tarkastele osallistujia
submenu.lectureadmin.manageLectureGroups = Hallinnoi
submenu.lectures.viewLectures = Ilmoittaudu
subnavi.cards = \u0009\u0009
subnavi.info = Info
success = Onnistui
topnavi.adminlectures = Kurssit ja luennot
topnavi.license = Lisenssikoodit
topnavi.userlectures = Kurssit ja luennot
user.cropImage = Crop
user.imageUpload.imageNotFound = Select image to upload
user.saveUserSelectableRoles = Tallenna
......@@ -354,8 +295,6 @@ user.shirt.select = Valitse yksi
user.shirtSize = Paidan koko
user.unauthenticated = Kirjautumaton
user.userSelectableRoles = Valitse yksi
usercart.downloadCsv = CSV
usercart.showoverview = Vie tarkastusn\u00E4kym\u00E4\u00E4n
viewlectures.title = Kurssit ja luennot
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
#Sat Mar 30 17:56:44 EET 2013
acc_line.eventuser = Customer
acc_line.nick = Nick
acc_line.product = Product
acc_line.quantity = Quantity
acc_line.time = Transaction Date
accountEvent.commit = Save
accountEvent.delete = Delete
accountEvent.deliver = Deliver
......@@ -23,7 +21,6 @@ accountEvent.seller = Sold by
accountEvent.total = Total
accountEvent.unitPrice = Unit price
accountEvent.user = User
actionlog.create.header = Create new actionmessage
actionlog.create.message = Message
actionlog.create.role = Target role
......@@ -41,7 +38,6 @@ actionlog.task = Task
actionlog.tasklist.header = Tasklist
actionlog.time = Time
actionlog.user = User
adduser.back = Back
adduser.newphoto = Take new photo
adduser.newuser = Create new user
......@@ -50,12 +46,9 @@ adduser.tostart = Back to start
adduser.update = Update profile picture
adduser.welcome = Welcome
adduser.welcometext = Here you can add new user or update your current user profile image. Please select desired action below.
applicationPermission.description = description
applicationPermission.name = Rightsgroup
barcodeReader.readBarcode = Read barcode
bill.addr1 = Address 1
bill.addr2 = Address 2
bill.addr3 = Address 3
......@@ -98,16 +91,13 @@ bill.theirReference = Clients reference
bill.totalPrice = Total
bill.totalprice = Total
bill.vat = VAT
billLine.eventuser = Customer
billLine.nick = Nick
billLine.price = Unit Price
billLine.product = Product
billLine.quantity = Quantity
billLine.time = Order Date
billedit.billnotfound = Bill not found. Select again.
billine.linePrice = Total (inc. vat)
billine.name = Product
billine.quantity = Quantity
......@@ -117,9 +107,7 @@ billine.unitName = Unit
billine.unitPrice = Unit price
billine.vat = VAT
billine.vatp = vat-%
bills.noBills = No bills
bortalApplication.BILL = Creating, and managing bills
bortalApplication.COMPO = Managing compos
bortalApplication.CONTENT = Product & shop management
......@@ -212,12 +200,9 @@ bortalApplication.user.VIEW_SELF = Can view
bortalApplication.user.VITUTTAAKO = Can send feedback
bortalApplication.user.WRITE_ORGROLES = Modify organization roles
bortalApplication.user.WRITE_ROLES = Modify roles
card.massprint.title = Print all
cardCode.code = Code
cardCode.type = Type
cardObjectData.create = Add object data
cardObjectData.edit = Edit
cardObjectData.save = Save
......@@ -230,7 +215,6 @@ cardObjectData.type.USERS_PICTURE = User's picture
cardObjectData.x = X coordinate
cardObjectData.y = Y coordinate
cardObjectData.zindex = Z index
cardTemplate.create = Create
cardTemplate.edit = Edit
cardTemplate.id = Id
......@@ -240,9 +224,7 @@ cardTemplate.power = Card power
cardTemplate.roles = Associated roles
cardTemplate.save = Save
cardTemplate.sendImage = Upload Image
cardTemplateData.list = List datas
cardTextData.create = Add text data
cardTextData.edit = Edit
cardTextData.fontcolor = Font color
......@@ -272,13 +254,11 @@ cardTextData.type.WHOLENAME = Wholename
cardTextData.x = X coordinate
cardTextData.y = Y coordinate
cardTextData.zindex = Z index
cart.item = Item
cart.item_quantity = Quantity
cart.item_total = Total
cart.item_unitprice = Price
cart.total = Total
checkout.cancel.errorMessage = Error confirming the cancel\u2026 Please report this to code@codecrew.fi
checkout.cancel.successMessage = You can retry payment at your own bills.
checkout.reject.errorMessage = Error while processing rejected payment. Please report this error to code@codecrew.fi
......@@ -287,29 +267,21 @@ checkout.return.errorDelayed = Error confirming delayed payment. Please contac
checkout.return.errorMessage = Error confirming the successfull return message. Please report this error to code@codecrew.fi
checkout.return.successDelayed = Delayed payment successfull. Payment will be confirmed at a later time, usually within a hour.
checkout.return.successMessage = Payment confirmed. Your products have been paid.
code.inputfield = Give readercode
compo.edit = Edit compo
compo.saveVotes = Save votes
compo.savesort = Save order
compo.votesSaved = Votes saved
compoMgmtView.compo.entries = Entries
compofile.download = Download
compofile.download.header = Download file
compofile.fileName = Filename
compofile.shaChecksum = SHA checksum
compofile.upload = Upload file
compofile.uploadTime = Upload time
content.showContentEditLinks = Show content edit links
create = Create
delete = Delete
discount.active = Active
discount.amountMax = Max amount
discount.amountMin = Min amount
......@@ -326,21 +298,14 @@ discount.save = Save
discount.shortdesc = Description
discount.validFrom = Valid from
discount.validTo = Valid to
edit = Edit
editplace.header = Edit place
editplace.placegroup.title = Placegroup
editplacegroup.header = Placegroup information
entry.edit = Edit entry
error = Error
error.contact = If this happens again, contact Info with the following code:
error.error = You have encountered an error.
event.defaultRole = Default user role
event.domains.title = Domain
event.edit = Edit
......@@ -353,11 +318,9 @@ event.properties.title = Properties
event.referenceNumberBase = Reference number base
event.save = Save
event.startTime = Start time
eventdomain.add = Add event domain
eventdomain.domainname = Domain
eventdomain.remove = Remove
eventmap.active = Active
eventmap.buyable.like = Place name match
eventmap.buyable.lock = Lock places
......@@ -365,7 +328,6 @@ eventmap.buyable.release = Release places
eventmap.name = Map name
eventmap.notes = Notes
eventmap.save = Save
eventorg.bankName1 = Bank name 2
eventorg.bankName2 = Bank name 2
eventorg.bankNumber1 = Bank account nr. 1
......@@ -383,17 +345,12 @@ eventorg.events = Event of the organisation
eventorg.id = Event ID
eventorg.organisation = Organisation name
eventorg.save = Save
eventorgView.eventname = Name of event
eventorganiser.name = Eventorganiser
feedback.canFeedback = Feedback
feedback.submit = Submit
feedback.thanks = Thanks
food = Food
foodWave.accountevents = Accountevents
foodWave.activeFoodWaves = Active Foodwaves
foodWave.billLines = Pending Online Payments
......@@ -412,14 +369,11 @@ foodWave.templatename = Choose Products
foodWave.time = Time
foodWave.totalReserved = Total
foodWave.unconfirmedOrders = Unconfirmed
foodadmin.editTemplate = Edit
foodshop.buyAndPay = Buy and Pay
foodshop.buyFromCounter = Pay at info
foodshop.buyFromInternet = Pay at Internet
foodshop.total = Total
foodwave.buyInPrice = Buy In Price
foodwave.foodwaveBuyInPrice = Total buy in price
foodwave.markPaid = Foodwave marked paid
......@@ -434,9 +388,7 @@ foodwave.template.name = Name
foodwave.template.selectproducts = Products
foodwave.totalCount = Amount
foodwave.totalPrice = Customer Price
foodwaveTemplate.name = Name
foodwavetemplate.actions = Actions
foodwavetemplate.addproduct = Add
foodwavetemplate.basicinfo = Template
......@@ -456,7 +408,6 @@ foodwavetemplate.savetemplate = Submit
foodwavetemplate.selectproducts = Products
foodwavetemplate.startTime = Foodwave time
foodwavetemplate.waveName = Wave name
game.active = Active
game.code = Code
game.codecount = Opened
......@@ -472,34 +423,26 @@ game.open = Open code
game.out = Please contact out customer service
game.product = Product
game.service = Game service
gamepoints = Gamepoints
generic.sure.header = Confirmation
generic.sure.message = Are you sure?
generic.sure.no = No
generic.sure.yes = Yes
global.cancel = Cancel
global.copyright = Codecrew Ry
global.eventname = Event name
global.notAuthorizedExecute = You are not authorized to do that!!
global.notauthorized = You don't have enough rights to enter this site.
global.save = Save
httpsession.creationTime = Created
httpsession.invalidate = Invalidate
imagefile.description = Description
imagefile.file = Imagefile
importuser.file = File
importuser.template = Template
incomingView.attach = Attach
incomingView.attachDialogTitle = Attach code to user
incomingView.cancel = Cancel
incomingflow.alreadyShowingUser.message = We are already showing selected user
incomingflow.alreadyShowingUser.title = Already selected
incomingflow.barcode = Barcode
......@@ -519,25 +462,21 @@ incomingflow.userdetails = User details
incomingflow.usereditor = User
incomingflow.usereditor.info = User
incomingflow.usereditor.picture = Picturetake
infoview.back = Back
infoview.computerplace = Computer places
infoview.shop = Shop
inventory.product.info = Info
inventory.product.name = Product
inventory.product.pickProduct = Pick product
inventory.product.quantity = Quantatity
inventory.product.submitButton = Add
inventory.product.title = Add items to storage
invite.createNewUserHeader = Create new user
invite.emailexists = User with that email address already exists in the system.
invite.existingUserHeader = Login with existing username
invite.notFound = Invite invalid or already used
invite.successfull = Invite sent successfully
invite.userCreateSuccessfull = User successfully created. You can now login.
javax.validation.constraints.AssertFalse.message = must be false
javax.validation.constraints.AssertTrue.message = must be true
javax.validation.constraints.DecimalMax.message = must be less than or equal to {value}
......@@ -551,7 +490,6 @@ javax.validation.constraints.Null.message = must be null
javax.validation.constraints.Past.message = must be in the past
javax.validation.constraints.Pattern.message = must match "{regexp}"
javax.validation.constraints.Size.message = size must be between {min} and {max}
lanEventPrivateProperty.createProperty = Create private property
lanEventPrivateProperty.defaultValue = Default value
lanEventPrivateProperty.editProperty = Edit property
......@@ -560,7 +498,6 @@ lanEventPrivateProperty.save = Save
lanEventPrivateProperty.textValue = Text value
lanEventPrivateProperty.value = Private property value
lanEventPrivateProperty.valueIsRawdataWarning = Raw value
lanEventProperty.booleanValue = Boolean value
lanEventProperty.confirmDelete = Confirm delete
lanEventProperty.createProperty = Create property
......@@ -573,11 +510,9 @@ lanEventProperty.save = Save
lanEventProperty.textValue = Text value
lanEventProperty.value = Property value
lanEventProperty.valueIsRawdataWarning = Raw data warning
layout.editBottom = Edit bottom content
layout.editContent = Edit center
layout.editTop = Edit topcontent
lecture.availableLectures = available lectures
lecture.availableLecturesCalendar = In calendar
lecture.availableLecturesList = In list
......@@ -601,7 +536,6 @@ lecture.saveLecture = Edit
lecture.selectgroup = Select lecturegroup
lecture.startTime = Start time
lecture.unparticipate = Remove participation
lectureGroup.createLectureGroup = Create lecturegroup
lectureGroup.createNew = Create new
lectureGroup.description = Description
......@@ -611,11 +545,9 @@ lectureGroup.saveLectureGroup = Edit lecturegroup
lectureGroup.selectCount = Max lecture select count
lectureGroup.selectCountUserInfo = Quota for one participant
lectureGroup.view = View
lecturegroup.create.success = Lecturegroup created successfully.
lecturegroup.list.title = Lectures
lecturegroup.save.success = Lecturegroup saved succesfully.
license.active = Active
license.description = Description
license.name = Name
......@@ -623,18 +555,15 @@ license.product = Product
license.save = Save
license.service = Service
license.url = Url
login.login = Login
login.logout = Logout
login.logoutmessage = You have logged out of the system
login.password = Password
login.submit = Login
login.username = Username
loginerror.header = Login failed
loginerror.message = Username of password incorrect.
loginerror.resetpassword = Reset password
map.create = Create map
map.createTileMap = Create tilemap
map.edit = Edit
......@@ -654,20 +583,15 @@ map.tableXdiff = Table X difference
map.tableYdiff = Table Y difference
map.tablesHorizontal = Generate horizontal tables
map.width = Place width (px)
mapEdit.removePlaces = Remove ALL places
mapManage.lockedPlaces = Locked {0} places.
mapManage.releasedPlaces = Released {0} places
mapView.buyPlaces = Lock selected places
mapView.errorWhenReleasingPlace = Error when releasing place
mapView.errorWhenReservingPlace = Error when reserving place!
mapView.errorWhileBuyingPlaces = Error when buying places. Please try again. If error reoccurs please contact organizers.
mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
mapedit.save = Save map changes
menu.index = Index
menu.item = Item
menu.name = Name
......@@ -677,14 +601,10 @@ menu.select = Select
menu.sort = Sort
menu.toAdmin = Adminview
menu.toUser = Userview
menuitem.key = Menuitem key
menuitem.navigation.key = Product flag
menulist.header = Menulist
nasty.user = Go away!
networkassociation.action = Action
networkassociation.create_association = Create association
networkassociation.create_time = Created on
......@@ -696,14 +616,12 @@ networkassociation.modify_time = Modified on
networkassociation.pending_associations = Pending Associations
networkassociation.place = Place
networkassociation.user = User
news.abstract = Abstract
news.edit = Edit
news.expire = Expire
news.publish = Publish
news.save = Save
news.title = Title
newsgroup.contents = Newsgroup content
newsgroup.create = Create newsgroup
newsgroup.createNewNews = Create a news article to this newsgroup
......@@ -715,24 +633,18 @@ newsgroup.priority = Priority
newsgroup.readerRole = Reader roles
newsgroup.save = Save
newsgroup.writerRole = Writer roles
newslist.header = Newsgroups
off = Off
on = On
org.hibernate.validator.constraints.Email.message = not a well-formed email address
org.hibernate.validator.constraints.Length.message = length must be between {min} and {max}
org.hibernate.validator.constraints.NotEmpty.message = may not be empty
org.hibernate.validator.constraints.Range.message = must be between {min} and {max}
orgrole.create = Create
orgrole.edit = Edit orgrole
orgrole.list.title = Organization role list
orgrole.name = Name
orgrole.parents = Parent
page.account.edit.header = Edit account events
page.account.list.header = Account events
page.admin.sendimage.header = Send image
......@@ -797,30 +709,24 @@ page.user.list.header = Users
page.user.list.pagegroup = user
page.user.mygroups.header = My places
page.viewexpired = frontpage
pagination.firstpage = First
pagination.lastpage = Last
pagination.nextpage = Next
pagination.pages = Pages
pagination.previouspage = Previous
pagination.results = Results
passwordChanged.body = You can now login with the new password.
passwordChanged.header = Password changed successfully.
passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator.
passwordReset.hashNotFound = Password change token has expired. Please send the query again.
passwordreset.emailnotfound = Email address not found.
passwordreset.mailBody = You can change your password in address: {0}\n\nIf you have not requested password reset, ignore this message.\n\n
passwordreset.mailSubject = [{0}] Password reset
passwordreset.unknownerror = Unknown error when resetting password. Please contact administration
passwordreset.usernotfound = Username not found.
permissiondenied.alreadyLoggedIn = You don't have enough rights
permissiondenied.header = Access denied
permissiondenied.notLoggedIn = You don't have enough rights to enter this site.
place.buyable = Buyable
place.code = Placecode
place.commit = Save
......@@ -840,7 +746,6 @@ place.release = Release this place
place.releasetime = Releasetime
place.reserveForUser = Reserve for the user
place.width = Width
placeSelect.legend.blue = My selected place
placeSelect.legend.green = My reserved place
placeSelect.legend.grey = Released if needed
......@@ -853,7 +758,6 @@ placeSelect.placesleft = Places left
placeSelect.reservationPrice = Reservation price
placeSelect.reservedPlaces = Reserved places
placeSelect.totalPlaces = Places in total
placegroup.created = Created
placegroup.creator = Reserver
placegroup.details = Details
......@@ -863,9 +767,7 @@ placegroup.name = Name
placegroup.placename = Place
placegroup.places = Places
placegroup.printPdf = Print tickets
placegroupView.editplace = Edit place
placegroupview.groupCreator = Reserver
placegroupview.header = My places
placegroupview.noMemberships = No places
......@@ -875,14 +777,12 @@ placegroupview.releasePlace = Release
placegroupview.reservationName = Place
placegroupview.reservationProduct = Product
placegroupview.token = Placecode / user
placetoken.commit = Associate token
placetoken.pageHeader = Add token
placetoken.placelist = My places
placetoken.token = Token
placetoken.tokenNotFound = Token not found! Check token
placetoken.topText = You can associate a ticket bought by someone else to your account by inserting a token to the field below
poll.answer = Answer to poll
poll.begin = Open poll
poll.create = Create
......@@ -891,15 +791,12 @@ poll.edit = Edit
poll.end = Close poll
poll.name = Poll name
poll.save = Send answers
print = Print
printedCard.cardState = Card state
printedCard.cardState.PENDING_VALIDATION = Pending validation
printedCard.cardState.REJECTED = Rejected
printedCard.cardState.VALIDATED = Validated
printedCard.template = Template
product.barcode = Barcode
product.billed = Billed
product.boughtTotal = Products billed
......@@ -909,6 +806,7 @@ product.cashed = Cashpaid
product.color = Color in UI
product.create = Create product
product.createDiscount = Add volumediscount
product.createLimit = Create product limitation
product.edit = edit
product.inventoryQuantity = Inventory count
product.name = Name of product
......@@ -925,19 +823,25 @@ product.sort = Sort nr
product.totalPrice = Total
product.unitName = Unit name
product.vat = VAT-% (0.0 - 0.99)
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Create new place bought
productFlag.HIDE_FROM_INFOSHOP = Hide from info shop
productFlag.PREPAID_CREDIT = Prepaid credit
productFlag.PREPAID_INSTANT_CREATE = Prepaid instant create
productFlag.RESERVE_PLACE_WHEN_BOUGHT = Reserve place when bought
productFlag.USER_SHOPPABLE = User shoppable
productLimit.description = Description
productLimit.edit = Edit
productLimit.last = Last limitation
productLimit.lowerLimit = Lower limit
productLimit.name = Type
productLimit.roles = Roles
productLimit.save = Save
productLimit.sort = Sort number
productLimit.type = Limitation type
productLimit.upperLimit = Upper limit
products.create = Create product
products.save = Save
productsShopView.readBarcode = Read
productshop.billCreated = Bill created
productshop.commit = Buy
productshop.limits = Available
......@@ -947,7 +851,6 @@ productshop.noItemsInCart = There are no products in shopping cart
productshop.plusOne = +1
productshop.plusTen = +10
productshop.total = Total
reader.assocToCard = Associate to card
reader.automaticProduct = Default product
reader.automaticProductCount = Amount
......@@ -963,21 +866,15 @@ reader.select = Select reader
reader.tag = Tag
reader.type = Type
reader.user = User
readerView.searchforuser = Search user
readerevent.associateToUser = Associate to user
readerevent.saveEvent = Save event
readerevent.seenSince = Last seen
readerevent.shopToUser = Buy to user
readerevent.tagname = Tag
readerview.cards = Card ( printcount )
refresh = Refresh
registerleaflet.title = Register leaflet
rejectcard.body = Body
rejectcard.mailBody = Your profile picture for event {0} has been rejected. Please upload new picture as soon as possible. Picture is valid if your face is shown clearly and can be easily recognized. \n\n
rejectcard.mailSubject = Profile picture rejected
......@@ -987,21 +884,17 @@ rejectcard.sendRejectionMail = Send mail
rejectcard.subject = Subject
rejectcard.toAddr = Email address
rejectcard.toName = Name
resetMail.body = You can change a forgotten password by inserting your username or email address to the field below. A link where you can change the password will be sent to the email address associated to that.
resetMail.email = Email address
resetMail.header = Reset lost password
resetMail.send = Send
resetMail.username = Username
resetmailSent.body = Email has been sent containing a link where you can change the password.
resetmailSent.header = Email sent
rfidevent.empty = Empty
rfidevent.reader = Reader
rfidevent.searchuser = Search user
rfidevent.tag = Tag
role.cardtemplate = Cardtemplate
role.create = Create role
role.description = Description
......@@ -1015,23 +908,17 @@ role.read = (R)
role.savePermissions = Save permissions
role.userSelectableRole = User selectable role
role.write = (W)
roleView.adduser = Add user
roleView.hidePermissioneditor = Hide permissioneditor
roleView.members = Users
roleView.save = Save changes
roleView.showPermissioneditor = Show permissioneditor
salespoint.edit = Edit
salespoint.name = Name
salespoint.noSalesPoints = Amount
save = Save
sendImage = Send image
sendPicture.header = S
shop.accountBalance = Credits
shop.actions = Actions
shop.afterBalance = Balance after action
......@@ -1058,7 +945,6 @@ shop.toAccountValue = To account
shop.totalPrice = Total
shop.transactionTotal = Transaction total
shop.user = Selling to
sidebar.bill.list = My bills
sidebar.bill.listAll = All bills
sidebar.bill.summary = Summary of bills
......@@ -1086,7 +972,6 @@ sidebar.user.list = Users
sidebar.users = Users
sidebar.utils.flushCache = Flush Cache
sidebar.utils.testdata = Testdata
sitepage.addContent = Add content block
sitepage.content.expire = Expire time
sitepage.content.locale = Show for language
......@@ -1098,9 +983,7 @@ sitepage.edit = Edit
sitepage.name = Page name
sitepage.roles = Visible for roles
sitepage.save = Save
sitepagelist.header = Site pages
submenu.NotImplementedYet = Not implemented
submenu.actionlog.messagelist = ActionLog
submenu.actionlog.taskview = View tasks
......@@ -1194,19 +1077,15 @@ submenu.voting.compolist = Compos
submenu.voting.create = Create new compo
submenu.voting.myEntries = My entries
submenu.voting.submitEntry = Submit entry
subnavi.billing = Billing
subnavi.cards = Cards
subnavi.info = Info
subnavi.products = Products
subnavi.readers = Readers
subnavi.roles = Roles
success = Success
supernavi.admin = Adminview
supernavi.user = Userview
svm.failure.errorMessage = Payment error.
svm.failure.successMessage = Payment error successfull\u2026 ( Possibly already marked paid )
svm.notification.errorMessage = Payment failed
......@@ -1215,13 +1094,10 @@ svm.pending.errorMessage = Unknown error! If payment was successfull emai
svm.pending.successMessage = Payment pending. You will receive email after payment verification.
svm.success.errorMessage = Payment could not be verified!
svm.success.successMessage = Payment was successfull. You can now your credits in the system.
template.loggedInAs = Logged in as
topmenu.admin = Admin View
topmenu.helpdesk = Helpdesk
topmenu.user = User View
topnavi.adminassoc = Net Associations
topnavi.adminlectures = Lectures and courses
topnavi.adminshop = Adminshop
......@@ -1251,7 +1127,6 @@ topnavi.userlectures = Lectures and courses
topnavi.usermgmt = Users
topnavi.userplaces = Computer Places
topnavi.usershop = Shop
tournament.admin.back_to_index = Back to tournament administration
tournament.admin.control = Control
tournament.admin.create = Create new tournament
......@@ -1300,7 +1175,6 @@ tournament.teammember.delete = Delete
tournament.teammember.login = Login
tournament.teammember.name = Name
tournament.type = Type
tournaments.accept_rules_and_participate = Accept rules and participate
tournaments.active_tournaments = Active tournaments
tournaments.add_backup_player_to_team = Add backup player
......@@ -1362,7 +1236,6 @@ tournaments.tournament_details = Tournament det
tournaments.tournament_gameplay = Gameplay settings
tournaments.tournament_name = Tournament name
tournaments.tournament_type = Tournament type
user.accountBalance = Account balance
user.accountEventHeader = Account events
user.accountevents = Account events
......@@ -1470,11 +1343,8 @@ user.validateUser.header = Please insert credentials
user.wholeName = Name
user.wholename = Full name
user.zipCode = Postal nr.
userImport.commit = Commit
userView.image = Image
usercart.addSearchedUsers = Add searched users
usercart.cartsize = Size
usercart.clear = Clear Cart
......@@ -1483,9 +1353,7 @@ usercart.prev = Previous user
usercart.removeCurrent = Remove from usercart
usercart.showCart = Show usercart
usercart.traverse = Traverse
userimage.webcam = Take picture with webcam
userlist.header = Users
userlist.onlythisevent = Limit to users of this event
userlist.placeassoc = Assigned to place
......@@ -1495,9 +1363,7 @@ userlist.search = Search
userlist.searchcount = Result count
userlist.showAdvancedSearch = Advanced search
userlist.usersWithUnusedCodes = List this event's users with unused place codes
usertitle.managingUser = Shop
userview.header = Users
userview.invalidEmail = Invalid email address
userview.loginstringFaulty = Username has to be atleast 2 characters long!
......@@ -1506,12 +1372,9 @@ userview.passwordTooShort = Password has to be atleast 5 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.
viewexpired.body = Please login again.
viewexpired.title = Login expired. Please login again.
viewlectures.title = Courses and lectures
voting.allcompos.curEntries = # of entries
voting.allcompos.descri = Description
voting.allcompos.description = List of all compos and theirs information.
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
#Sat Mar 30 17:56:44 EET 2013
acc_line.eventuser = Asiakas
acc_line.nick = Nimimerkki
acc_line.product = Tuote
acc_line.quantity = M\u00E4\u00E4r\u00E4
acc_line.time = Ostoaika
accountEvent.commit = Tallenna
accountEvent.delete = Poista
accountEvent.deliver = Toimita
......@@ -23,7 +21,6 @@ accountEvent.seller = Myyj\u00E4
accountEvent.total = Yhteens\u00E4
accountEvent.unitPrice = Yksikk\u00F6hinta
accountEvent.user = K\u00E4ytt\u00E4j\u00E4
actionlog.create.header = Luo uusi ActionMessage
actionlog.create.message = Viesti
actionlog.create.role = Kohderooli
......@@ -41,7 +38,6 @@ actionlog.task = Teht\u00E4v\u00E4
actionlog.tasklist.header = Teht\u00E4v\u00E4lista
actionlog.time = Aika
actionlog.user = Tekij\u00E4
adduser.back = Takaisin
adduser.newphoto = Ota uusi kuva
adduser.newuser = Luo uusi k\u00E4ytt\u00E4j\u00E4tunnus
......@@ -50,12 +46,9 @@ adduser.tostart = Takaisin alkuun
adduser.update = P\u00E4ivit\u00E4 profiilin kuva
adduser.welcome = Tervetuloa
adduser.welcometext = Voit luoda t\u00E4ss\u00E4 k\u00E4tev\u00E4sti uuden tunnuksen tai vaihtaa nykyisen tunnuksen profiilikuvan uudempaan.
applicationPermission.description = kuvaus
applicationPermission.name = Oikeusryhm\u00E4
barcodeReader.readBarcode = Lue viivakoodi
bill.addr1 = Osoite 1
bill.addr2 = Osoite 2
bill.addr3 = Osoite 3
......@@ -99,16 +92,13 @@ bill.theirReference = Asiakkaan viite
bill.totalPrice = Summa
bill.totalprice = Yhteens\u00E4
bill.vat = ALV
billLine.eventuser = Asiakas
billLine.nick = Nimimerkki
billLine.price = Kappalehinta
billLine.product = Tuote
billLine.quantity = M\u00E4\u00E4r\u00E4
billLine.time = Tilausaika
billedit.billnotfound = Laskua ei l\u00F6ytynyt. Ole hyv\u00E4 ja valitse uudelleen.
billine.linePrice = Yhteens\u00E4 (sis. alv)
billine.name = Tuote
billine.quantity = Lukum\u00E4\u00E4r\u00E4
......@@ -118,9 +108,7 @@ billine.unitName = Yksikk\u00F6
billine.unitPrice = Yksikk\u00F6hinta
billine.vat = ALV
billine.vatp = alv-%
bills.noBills = Ei laskuja
bortalApplication.BILL = Laskujen oikeudet
bortalApplication.COMPO = Compojen oikeudet
bortalApplication.CONTENT = Sis\u00E4lt\u00F6jen hallitaoikeudet
......@@ -213,12 +201,9 @@ bortalApplication.user.VIEW_SELF = Voi katse
bortalApplication.user.VITUTTAAKO = Saa avautua
bortalApplication.user.WRITE_ORGROLES = Saa muokata organisaation rooleja
bortalApplication.user.WRITE_ROLES = Saa muokata rooleja
card.massprint.title = Tulosta kaikki
cardCode.code = Koodi
cardCode.type = Tyyppi
cardObjectData.create = Liit\u00E4 kuvia
cardObjectData.edit = Muokkaa
cardObjectData.save = Tallenna
......@@ -231,7 +216,6 @@ cardObjectData.type.USERS_PICTURE = K\u00E4ytt\u00E4j\u00E4n kuva
cardObjectData.x = X koordinaatti
cardObjectData.y = Y koordinaatti
cardObjectData.zindex = Z index
cardTemplate.create = Luo
cardTemplate.edit = Muokkaa
cardTemplate.id = Id
......@@ -241,9 +225,7 @@ cardTemplate.power = Teho
cardTemplate.roles = Yhdistetyt roolit
cardTemplate.save = Tallenna
cardTemplate.sendImage = Lataa kuva
cardTemplateData.list = Ohjeissis\u00E4ll\u00F6n listaus
cardTextData.create = Liit\u00E4 teksti\u00E4
cardTextData.edit = Muokkaa
cardTextData.fontcolor = Fontin v\u00E4ri
......@@ -273,13 +255,11 @@ cardTextData.type.WHOLENAME = Kokonimi
cardTextData.x = X koordinaatti
cardTextData.y = Y koordinaatti
cardTextData.zindex = Z index
cart.item = Tuote
cart.item_quantity = M\u00E4\u00E4r\u00E4
cart.item_total = Yhteens\u00E4
cart.item_unitprice = Hinta
cart.total = Yhteens\u00E4
checkout.cancel.errorMessage = Virhe peruutuksen vahvistuksessa\u2026 Ilmoita t\u00E4st\u00E4 osoitteeseen code@codecrew.fi
checkout.cancel.successMessage = Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
checkout.reject.errorMessage = Virhe hyl\u00E4tyn maksun k\u00E4sittelyss\u00E4. Raportoi t\u00E4m\u00E4 virhe osoitteeseen: code@codecrew.fi
......@@ -288,29 +268,21 @@ checkout.return.errorDelayed = Virhe viiv\u00E4stetyn maksun vahvistuksessa. O
checkout.return.errorMessage = Virhe maksun onnistuneen maksun vahvistuksessa. Raportoi t\u00E4m\u00E4 virhe yll\u00E4pidolle: code@codecrew.fi
checkout.return.successDelayed = Viiv\u00E4stetty maksu onnistunut. Maksu vahvistet\u00E4\u00E4n my\u00F6hemp\u00E4n\u00E4 ajankohtana, yleens\u00E4 noin tunnin sis\u00E4ll\u00E4.
checkout.return.successMessage = Maksu vahvistettu. Tuotteet on maksettu. Voit siirty\u00E4 eteenp\u00E4in tilauksessasi.
code.inputfield = Sy\u00F6t\u00E4 viivakoodi
compo.edit = Muokkaa compoa
compo.saveVotes = Tallenna \u00E4\u00E4net
compo.savesort = Tallenna j\u00E4rjestys
compo.votesSaved = \u00C4\u00E4net tallennettu
compoMgmtView.compo.entries = Entryt
compofile.download = Lataa
compofile.download.header = Lataa tiedosto
compofile.fileName = Tiedoston nimi
compofile.shaChecksum = SHA tarkistesumma
compofile.upload = L\u00E4het\u00E4 tiedosto
compofile.uploadTime = Tallennusaika
content.showContentEditLinks = N\u00E4yt\u00E4 sis\u00E4ll\u00F6nmuokkauslinkit
create = Luo
delete = Poista
discount.active = Aktiivinen
discount.amountMax = Enimm\u00E4ism\u00E4\u00E4r\u00E4
discount.amountMin = V\u00E4himm\u00E4ism\u00E4\u00E4r\u00E4
......@@ -327,21 +299,14 @@ discount.save = Tallenna
discount.shortdesc = Kuvaus
discount.validFrom = Voimassa alkaen
discount.validTo = Voimassa asti
edit = Muokkaa
editplace.header = Muokkaa paikkaa
editplace.placegroup.title = Paikkaryhm\u00E4
editplacegroup.header = Paikkaryhm\u00E4n tiedot
entry.edit = Muokkaa
error = Virhe
error.contact = Jos t\u00E4m\u00E4 toistuu, ota seuraava koodi talteen ja ota yhteys Infoon:
error.error = Olet kohdannut virheen.
event.defaultRole = K\u00E4ytt\u00E4jien oletusrooli
event.domains.title = Verkkotunnus
event.edit = Muokkaa
......@@ -354,11 +319,9 @@ event.properties.title = Ominaisuudet
event.referenceNumberBase = Viitenumeron pohja
event.save = Tallenna
event.startTime = Aloitusp\u00E4iv\u00E4
eventdomain.add = Lis\u00E4\u00E4 verkkotunnus tapahtumalle
eventdomain.domainname = Verkkotunnus
eventdomain.remove = Poista
eventmap.active = Aktiivinen\u0009
eventmap.buyable.like = Paikat
eventmap.buyable.lock = Lukitse paikat
......@@ -366,7 +329,6 @@ eventmap.buyable.release = Vapauta paikat
eventmap.name = Kartan nimi
eventmap.notes = Lis\u00E4tiedot
eventmap.save = Tallenna
eventorg.bankName1 = Pankin nimi 1
eventorg.bankName2 = Pankin nimi 2
eventorg.bankNumber1 = Tilinumero 1
......@@ -384,17 +346,12 @@ eventorg.events = Organisaation tapahtumat
eventorg.id = Tapahtuman ID
eventorg.organisation = Organisaation nimi
eventorg.save = Tallenna
eventorgView.eventname = Tapahtuman nimi
eventorganiser.name = Tapahtumaj\u00E4rjest\u00E4j\u00E4
feedback.canFeedback = Vituttaako?
feedback.submit = L\u00E4het\u00E4
feedback.thanks = Kiiiiitooooos! :)
food = Ruoka
foodWave.accountevents = Maksetut tilaukset
foodWave.activeFoodWaves = Aktiiviset Ruokatilaukset
foodWave.billLines = Maksamattomat Verkkomaksut
......@@ -413,14 +370,11 @@ foodWave.templatename = Valitse tuotteet
foodWave.time = Aika
foodWave.totalReserved = Yhteens\u00E4
foodWave.unconfirmedOrders = Vahvistamattomia
foodadmin.editTemplate = Muokkaa
foodshop.buyAndPay = Varaa ja maksa
foodshop.buyFromCounter = Maksa infossa
foodshop.buyFromInternet = Maksa Internetiss\u00E4
foodshop.total = Yhteens\u00E4
foodwave.buyInPrice = Sis\u00E4\u00E4nostohinta
foodwave.foodwaveBuyInPrice = Sis\u00E4\u00E4nostohinta
foodwave.markPaid = Merkitty maksetuksi
......@@ -435,9 +389,7 @@ foodwave.template.name = Nimi
foodwave.template.selectproducts = Tuotteet
foodwave.totalCount = M\u00E4\u00E4r\u00E4
foodwave.totalPrice = Asiakkaan Hinta
foodwaveTemplate.name = Nimi
foodwavetemplate.actions = Toimet
foodwavetemplate.addproduct = Lis\u00E4\u00E4
foodwavetemplate.basicinfo = Tilauspohja
......@@ -457,7 +409,6 @@ foodwavetemplate.savetemplate = Tallenna
foodwavetemplate.selectproducts = Tuotteet
foodwavetemplate.startTime = Tilausaika
foodwavetemplate.waveName = Tilauksen nimi
game.active = Aktiivinen
game.code = Koodi
game.codecount = Avattuja
......@@ -473,21 +424,17 @@ game.open = Ota koodi k\u00E4ytt\u00F6\u00F6n
game.out = Ei voitu avata pelikoodia, ota yhteytt\u00E4 asiakaspalveluun.
game.product = Tuote
game.service = Pelipalvelu
gamepoints = Pelipisteit\u00E4
generic.sure.header = Varmistusikkuna
generic.sure.message = Oletko aivan varma?
generic.sure.no = Ei
generic.sure.yes = Kyll\u00E4
global.cancel = Peruuta
global.copyright = Codecrew Ry
global.eventname = Tapahtumanimi
global.notAuthorizedExecute = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia suorittaa t\u00E4t\u00E4 toimenpidett\u00E4!
global.notauthorized = Sinulla ei ole riitt\u00E4vi\u00E4 oikeuksia t\u00E4lle sivulle.
global.save = Tallenna
httpsession.creationTime = Luotu
httpsession.id = ID
httpsession.invalidate = Mit\u00E4t\u00F6i
......@@ -497,17 +444,13 @@ httpsession.lastAccessedTime = Viimeksi n\uFFFDhty
httpsession.maxInactiveInterval = Aikakatkaisu (s)
httpsession.sessionHasExisted = Ollut elossa (s)
httpsession.user = Tunnus
imagefile.description = Kuvaus
imagefile.file = Kuvatiedosto
importuser.file = Tiedosto
importuser.template = Malli
incomingView.attach = Liit\u00E4
incomingView.attachDialogTitle = Liit\u00E4 koodi k\u00E4ytt\u00E4j\u00E4\u00E4n
incomingView.cancel = Peruuta
incomingflow.alreadyShowingUser.message = Piipattu k\u00E4ytt\u00E4j\u00E4 on jo n\u00E4kyviss\u00E4
incomingflow.alreadyShowingUser.title = Valmiiksi valittu
incomingflow.barcode = Viivakoodi
......@@ -527,27 +470,22 @@ incomingflow.userdetails = K\u00E4ytt\u00E4j\u00E4n tiedot
incomingflow.usereditor = K\u00E4ytt\u00E4j\u00E4
incomingflow.usereditor.info = K\u00E4vij\u00E4
incomingflow.usereditor.picture = Kuvanotto
index.title = Etusivu
infoview.back = Takaisin
infoview.computerplace = Tietokonepaikat
infoview.shop = Kauppa
inventory.product.info = Info
inventory.product.name = Tuote
inventory.product.pickProduct = Valitse tuote
inventory.product.quantity = M\u00E4\u00E4r\u00E4
inventory.product.submitButton = Lis\u00E4\u00E4
inventory.product.title = Lis\u00E4\u00E4 tuottetta varastoon
invite.createNewUserHeader = Luo uusi k\u00E4ytt\u00E4j\u00E4tunnus
invite.emailexists = J\u00E4rjestelm\u00E4ss\u00E4 on jo k\u00E4ytt\u00E4j\u00E4tunnus samalla s\u00E4hk\u00F6postiosoitteella.
invite.existingUserHeader = Kirjaudu sis\u00E4\u00E4n olemassaolevalla tunnuksella
invite.notFound = Kutsu virheellinen tai jo k\u00E4ytetty.
invite.successfull = Kutsu l\u00E4hetetty
invite.userCreateSuccessfull = K\u00E4ytt\u00E4j\u00E4tunnus luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n j\u00E4rjeselm\u00E4\u00E4n.
javax.validation.constraints.AssertFalse.message = must be false
javax.validation.constraints.AssertTrue.message = must be true
javax.validation.constraints.DecimalMax.message = must be less than or equal to {value}
......@@ -561,7 +499,6 @@ javax.validation.constraints.Null.message = must be null
javax.validation.constraints.Past.message = must be in the past
javax.validation.constraints.Pattern.message = must match "{regexp}"
javax.validation.constraints.Size.message = size must be between {min} and {max}
lanEventPrivateProperty.createProperty = Luo yksityinen ominaisuus
lanEventPrivateProperty.defaultValue = Oletusarvo
lanEventPrivateProperty.editProperty = Muokkaa ominaisuutta
......@@ -570,7 +507,6 @@ lanEventPrivateProperty.save = Tallenna
lanEventPrivateProperty.textValue = Tekstiarvo
lanEventPrivateProperty.value = Ominaisuuden arvo
lanEventPrivateProperty.valueIsRawdataWarning = Raaka arvo
lanEventProperty.booleanValue = Totuusarvo
lanEventProperty.confirmDelete = Vahvista poisto
lanEventProperty.createProperty = Luo ominaisuus
......@@ -583,11 +519,9 @@ lanEventProperty.save = Tallenna
lanEventProperty.textValue = Tekstiarvo
lanEventProperty.value = Ominaisuuden arvo
lanEventProperty.valueIsRawdataWarning = Varoitus raakadatasta
layout.editBottom = Muokkaa alasis\u00E4lt\u00F6\u00E4
layout.editContent = Muokkaa sis\u00E4lt\u00F6\u00E4
layout.editTop = Muokkaa yl\u00E4sis\u00E4lt\u00F6\u00E4
lecture.availableLectures = Aihealueen kurssit ja luennot
lecture.availableLecturesCalendar = Kalenterina
lecture.availableLecturesList = Listana
......@@ -611,7 +545,6 @@ lecture.saveLecture = Muokkaa
lecture.selectgroup = Valitse aihealue
lecture.startTime = Aloitusaika
lecture.unparticipate = Poista ilmoittautuminen
lectureGroup.createLectureGroup = Luo kurssikokonaisuus
lectureGroup.createNew = Luo uusi
lectureGroup.description = Kuvaus
......@@ -621,11 +554,9 @@ lectureGroup.saveLectureGroup = Muokkaa kurssikokonaisuutta
lectureGroup.selectCount = Monellekko saa osallistua
lectureGroup.selectCountUserInfo = Yhden henkil\u00F6n kiinti\u00F6
lectureGroup.view = Tarkastele kursseja
lecturegroup.create.success = Kurssiryhm\u00E4 luotu onnistuneesti.
lecturegroup.list.title = Luennot
lecturegroup.save.success = Kurssiryhm\u00E4 tallennettu onnistuneesti.
license.active = Aktiivinen
license.description = Kuvaus
license.name = Nimi
......@@ -633,18 +564,15 @@ license.product = Tuote
license.save = Tallenna
license.service = Palvelu
license.url = Osoite
login.login = Kirjaudu sis\u00E4\u00E4n
login.logout = Kirjaudu ulos
login.logoutmessage = Olet kirjautunut ulos j\u00E4rjestelm\u00E4st\u00E4.
login.password = Salasana
login.submit = Kirjaudu sis\u00E4\u00E4n
login.username = K\u00E4ytt\u00E4j\u00E4tunnus
loginerror.header = Kirjautuminen ep\u00E4onnistui
loginerror.message = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana ei ollut oikein.
loginerror.resetpassword = Salasana unohtunut?
map.create = Luo kartta
map.createTileMap = Luo tilekartta
map.edit = Muokkaa
......@@ -664,20 +592,15 @@ map.tableXdiff = P\u00F6ytien v\u00E4li ( X )
map.tableYdiff = P\u00F6ytien v\u00E4li ( Y )
map.tablesHorizontal = P\u00F6yd\u00E4t vaakatasossa
map.width = Leveys (px)
mapEdit.removePlaces = Poista kaikki paikat
mapManage.lockedPlaces = Lukittu kartasta {0} paikkaa.
mapManage.releasedPlaces = Vapautettu kartasta {0} paikkaa
mapView.buyPlaces = Lukitse valitut paikat
mapView.errorWhenReleasingPlace = Paikkaa vapauttassa tapahtui virhe.
mapView.errorWhenReservingPlace = Paikkaa varatessa tapahtui virhe.
mapView.errorWhileBuyingPlaces = Virhe paikkojen ostossa. Ole hyv\u00E4 ja yrit\u00E4 uudelleen. Jos virhe toistuu ota yhteytt\u00E4 j\u00E4rjest\u00E4jiin.
mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suoritettuja konepaikkamaksuja t\u00E4m\u00E4n paikan varaamiseen.
mapedit.save = Tallenna muutokset
menu.index = Etusivu
menu.name = Nimi
menu.place.placemap = Paikkakartta
......@@ -688,13 +611,9 @@ menu.sort = J\u00E4rjest\u00E4
menu.toAdmin = Yll\u00E4piton\u00E4kym\u00E4
menu.toUser = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
menu.user.edit = Omat tiedot
menuitem.key = Valikkolinkin avain
menulist.header = Valikkolista
nasty.user = Mene pois!
networkassociation.action = Toiminto
networkassociation.create_association = Luo assosiaatio
networkassociation.create_time = Luontiaika
......@@ -706,14 +625,12 @@ networkassociation.modify_time = Muutosaika
networkassociation.pending_associations = Odottavat assosiaatiot
networkassociation.place = Paikka
networkassociation.user = K\u00E4ytt\u00E4j\u00E4
news.abstract = Lyhennelm\u00E4
news.edit = Muokkaa
news.expire = Lopeta julkaisu
news.publish = Julkaise
news.save = Tallenna
news.title = Otsikko
newsgroup.contents = Uutisryhm\u00E4n sis\u00E4lt\u00F6
newsgroup.create = Luo uutisryhm\u00E4
newsgroup.createNewNews = Luo uutinen uutisryhm\u00E4\u00E4n
......@@ -725,24 +642,18 @@ newsgroup.priority = Painoarvo
newsgroup.readerRole = Lukijoiden roolit
newsgroup.save = Tallenna
newsgroup.writerRole = Kirjoittajaryhm\u00E4
newslist.header = Uutisryhm\u00E4t
off = Poissa
on = P\u00E4\u00E4ll\u00E4
org.hibernate.validator.constraints.Email.message = V\u00E4\u00E4rin muotoiltu s\u00E4hk\u00F6postiosoite
org.hibernate.validator.constraints.Length.message = length must be between {min} and {max}
org.hibernate.validator.constraints.NotEmpty.message = may not be empty
org.hibernate.validator.constraints.Range.message = must be between {min} and {max}
orgrole.create = Luo
orgrole.edit = Muokkaa j\u00E4rjest\u00E4j\u00E4roolia
orgrole.list.title = Lista organisaation rooleista
orgrole.name = Nimi
orgrole.parents = Periytyy
page.account.edit.header = Muokkaa tilitapahtumia
page.account.list.header = Tilitapahtumat
page.admin.sendimage.header = L\u00E4het\u00E4 kuva
......@@ -780,30 +691,24 @@ page.svm.notification.header = Maksutapahtuman rekister\u00F6inti
page.svm.pending.header = Maksukuittausta odotetaan
page.svm.success.header = Verkkomaksu onnistui
page.user.create.header = Luo uusi k\u00E4ytt\u00E4j\u00E4
pagination.firstpage = Ensimm\u00E4inen
pagination.lastpage = Viimeinen
pagination.nextpage = Seuraava
pagination.pages = Sivuja
pagination.previouspage = Edellinen
pagination.results = Tuloksia
passwordChanged.body = Voit nyt kirjautua k\u00E4ytt\u00E4j\u00E4tunnuksella ja uudella salasanalla sis\u00E4\u00E4n j\u00E4rjestelm\u00E4\u00E4n.
passwordChanged.header = Salasana vaihdettu onnistuneesti
passwordReset.errorChanging = Odotamaton virhe. Ota yhteytt\u00E4 yll\u00E4pitoon.
passwordReset.hashNotFound = Salasanan vaihto on vanhentunut. Jos haluat vaihtaa salasanan l\u00E4het\u00E4 vaihtopyynt\u00F6 uudelleen.
passwordreset.emailnotfound = S\u00E4hk\u00F6postiosoitetta ei l\u00F6ydy.
passwordreset.mailBody = Voit vaihtaa salasanasi osoitteessa {0}\n\nJos et ole pyyt\u00E4nyt unohtuneen salasanan vaihtamista, ei t\u00E4h\u00E4n viestiin tarvitse reagoida.\n\n
passwordreset.mailSubject = [{0}] Salasanan vaihtaminen
passwordreset.unknownerror = Tuntematon virhe salasanan palauttamisessa. Ota yhteys yll\u00E4pitoon.
passwordreset.usernotfound = Annettua k\u00E4ytt\u00E4j\u00E4tunnusta ei l\u00F6ydy.
permissiondenied.alreadyLoggedIn = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia!
permissiondenied.header = P\u00E4\u00E4sy kielletty
permissiondenied.notLoggedIn = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia t\u00E4lle sivulle.
place.buyable = Ostettavissa
place.code = Paikkakoodi
place.commit = Tallenna
......@@ -824,7 +729,6 @@ place.release = Vapauta paikka
place.releasetime = Vapautusaika
place.reserveForUser = Varaa k\u00E4ytt\u00E4j\u00E4lle
place.width = Leveys
placeSelect.legend.blue = Oma valittu paikka
placeSelect.legend.green = Oma ostettu paikka
placeSelect.legend.grey = Vapautetaan tarvittaessa
......@@ -837,7 +741,6 @@ placeSelect.placesleft = Paikkoja j\u00E4ljell\u00E4
placeSelect.reservationPrice = Tilauksen hinta
placeSelect.reservedPlaces = Valitut paikat
placeSelect.totalPlaces = Paikkoja yhteens\u00E4
placegroup.created = Luotu
placegroup.creator = Varaaja
placegroup.details = Tiedot
......@@ -847,9 +750,7 @@ placegroup.name = Nimi
placegroup.placename = Paikka
placegroup.places = Paikat
placegroup.printPdf = Tulosta lipputositteet
placegroupView.editplace = Muokkaa paikkaa
placegroupview.groupCreator = Varaaja
placegroupview.header = Omat paikat
placegroupview.noMemberships = Ei omia paikkoja
......@@ -859,14 +760,12 @@ placegroupview.releasePlace = Vapauta
placegroupview.reservationName = Paikka
placegroupview.reservationProduct = Tuote
placegroupview.token = Paikkakoodi / k\u00E4ytt\u00E4j\u00E4
placetoken.commit = Liit\u00E4
placetoken.pageHeader = Lis\u00E4\u00E4 konepaikkakoodi
placetoken.placelist = Omat paikat
placetoken.token = Paikkakoodi
placetoken.tokenNotFound = Paikkakoodia ei l\u00F6ytynyt! Tarkista koodi.
placetoken.topText = Voit yhdist\u00E4\u00E4 paikan omaan k\u00E4ytt\u00E4j\u00E4tunnukseesi sy\u00F6tt\u00E4m\u00E4ll\u00E4 paikkakoodin allaolevaan kentt\u00E4\u00E4n.
poll.answer = Vastaa kyselyyn
poll.begin = Avaa kysely
poll.create = Luo
......@@ -875,15 +774,12 @@ poll.edit = Muokkaa
poll.end = Sulje kysely
poll.name = Kyselyn nimi
poll.save = L\u00E4het\u00E4 vastauksesi
print = Tulosta
printedCard.cardState = Kortin tila
printedCard.cardState.PENDING_VALIDATION = Odottaa hyv\u00E4ksynt\u00E4\u00E4
printedCard.cardState.REJECTED = Hyl\u00E4tty
printedCard.cardState.VALIDATED = Hyv\u00E4ksytty
printedCard.template = Kortin template
product.barcode = Viivakoodi
product.billed = Laskutettu
product.boughtTotal = Tuotteita laskutettu
......@@ -893,6 +789,7 @@ product.cashed = Ostettu k\u00E4teisell\u00E4
product.color = V\u00E4ri k\u00E4ytt\u00F6liittym\u00E4ss\u00E4
product.create = Luo tuote
product.createDiscount = Lis\u00E4\u00E4 m\u00E4\u00E4r\u00E4alennus
product.createLimit = Luo tuoterajoite
product.edit = Muokkaa
product.inventoryQuantity = Varastotilanne
product.name = Tuotteen nimi
......@@ -909,21 +806,26 @@ product.sort = J\u00E4rjestys luku
product.totalPrice = Summa
product.unitName = Tuoteyksikk\u00F6
product.vat = ALV-% (0.0 - 0.99)
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Luo uusi paikka ostettaessa
productFlag.HIDE_FROM_INFOSHOP = Piilota infon kaupasta
productFlag.PREPAID_CREDIT = Prepaid credit
productFlag.PREPAID_INSTANT_CREATE = Ostettaessa luotava tuote
productFlag.RESERVE_PLACE_WHEN_BOUGHT = Varaa paikka ostettaessa
productFlag.USER_SHOPPABLE = K\u00E4ytt\u00E4jien ostettavissa
productLimit.description = Kuvaus
productLimit.edit = Muokkaa
productLimit.last = Viimeinen rajoite
productLimit.lowerLimit = Alarajoite
productLimit.name = Tyyppi
productLimit.roles = roolit
productLimit.save = Tallenna
productLimit.sort = J\u00E4rjestysnumero
productLimit.type = Rajoitteen tyyppi
productLimit.upperLimit = Yl\u00E4rajoite
productShopView.readBarcode = Lue viivakoodi
products.create = Luo tuote
products.save = Tallenna
productsShopView.readBarcode = Lue
productshop.billCreated = Lasku luotu
productshop.commit = Osta
productshop.limits = Vapaana
......@@ -933,7 +835,6 @@ productshop.noItemsInCart = Ostoskorissa ei ole tuotteita
productshop.plusOne = +1
productshop.plusTen = +10
productshop.total = Yhteens\u00E4
reader.assocToCard = Yhdist\u00E4 korttiin
reader.automaticProduct = Oletustuote
reader.automaticProductCount = M\u00E4\u00E4r\u00E4
......@@ -949,21 +850,15 @@ reader.select = Valitse lukija
reader.tag = Tag
reader.type = Tyyppi
reader.user = K\u00E4ytt\u00E4j\u00E4
readerView.searchforuser = Etsi k\u00E4ytt\u00E4j\u00E4\u00E4
readerevent.associateToUser = Yhdist\u00E4 k\u00E4ytt\u00E4j\u00E4\u00E4n
readerevent.saveEvent = Tallenna tapahtuma
readerevent.seenSince = N\u00E4hty viimeksi
readerevent.shopToUser = Osta k\u00E4ytt\u00E4j\u00E4lle
readerevent.tagname = Tagi
readerview.cards = Kortit ( tulostuslkm )
refresh = P\u00E4ivit\u00E4
registerleaflet.title = Rekisteriseloste
rejectcard.body = Viestin sis\u00E4lt\u00F6
rejectcard.mailBody = {0} -tapahtuman profiiliisi sy\u00F6tetty kuva on hyl\u00E4tty soveltumattomana. Sy\u00F6t\u00E4 uusi kuva v\u00E4litt\u00F6m\u00E4sti. Kuvan saat asetettua profiili-sivulta. Hyv\u00E4ksytt\u00E4v\u00E4ss\u00E4 kuvassa kasvosi tulee n\u00E4ky\u00E4 selke\u00E4sti ja kokonaan. Tarkista uuden kuvan l\u00E4hett\u00E4misen j\u00E4lkeen, ett\u00E4 se on rajautunut oikein ja on oikeassa asennossa.
rejectcard.mailSubject = {0} -tapahtuman profiilin kuva hyl\u00E4tty
......@@ -973,21 +868,17 @@ rejectcard.sendRejectionMail = L\u00E4het\u00E4 s\u00E4hk\u00F6postia
rejectcard.subject = Viestin otsikko
rejectcard.toAddr = S\u00E4hk\u00F6postiosoite
rejectcard.toName = Nimi
resetMail.body = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi tai tunnukseen liitetyn s\u00E4hk\u00F6postiosoitteen allaolevaan kentt\u00E4\u00E4n. Tunnukseen liitettyyn s\u00E4hk\u00F6postiosoitteeseen l\u00E4hetet\u00E4\u00E4n kertak\u00E4ytt\u00F6inen osoite jossa voit vaihtaa sy\u00F6tt\u00E4m\u00E4si k\u00E4ytt\u00E4j\u00E4tunnuksen salasanan.
resetMail.email = S\u00E4hk\u00F6postiosoite
resetMail.header = Salasana unohtunut?
resetMail.send = L\u00E4het\u00E4
resetMail.username = K\u00E4ytt\u00E4j\u00E4tunnus
resetmailSent.body = Antamasi k\u00E4ytt\u00E4j\u00E4tunnuksen s\u00E4hk\u00F6postiosoitteeseen on l\u00E4hetetty osoite jossa voit vaihtaa tunnuksen salasanan.
resetmailSent.header = S\u00E4hk\u00F6posti l\u00E4hetetty
rfidevent.empty = Tyhj\u00E4
rfidevent.reader = Lukija
rfidevent.searchuser = Hae k\u00E4ytt\u00E4j\u00E4\u00E4
rfidevent.tag = T\u00E4gi
role.cardtemplate = Korttipohja
role.create = Luo rooli
role.description = Kuvaus
......@@ -998,23 +889,17 @@ role.parents = Periytyy
role.permissionheader = Roolin oikeudet
role.savePermissions = Tallenna oikeudet
role.userSelectableRole = K\u00E4ytt\u00E4j\u00E4n valittavissaoleva rooli
roleView.adduser = Lis\u00E4\u00E4 k\u00E4ytt\u00E4j\u00E4
roleView.hidePermissioneditor = Piilota oikeusasetukset
roleView.members = K\u00E4ytt\u00E4j\u00E4t
roleView.save = Tallenna muutokset
roleView.showPermissioneditor = N\u00E4yt\u00E4 oikeusasetukset
salespoint.edit = Muokkaa
salespoint.name = Nimi
salespoint.noSalesPoints = M\u00E4\u00E4r\u00E4
save = Tallenna
sendImage = L\u00E4het\u00E4 kuva
sendPicture.header = L\u00E4het\u00E4 kuva
shop.accountBalance = Credits
shop.actions = Hallinta
shop.afterBalance = Saldo tapahtuman j\u00E4lkeen
......@@ -1040,7 +925,6 @@ shop.toAccountValue = Tilille
shop.totalPrice = Yhteens\u00E4
shop.transactionTotal = Tapahtuma yhteens\u00E4
shop.user = Myyd\u00E4\u00E4n
sidebar.bill.list = Omat laskut
sidebar.bill.listAll = Kaikki laskut
sidebar.bill.summary = Laskujen yhteenveto
......@@ -1067,7 +951,6 @@ sidebar.user.list = K\u00E4ytt\u00E4j\u00E4t
sidebar.users = K\u00E4ytt\u00E4j\u00E4t
sidebar.utils.flushCache = Flush Cache
sidebar.utils.testdata = Testdata
sitepage.addContent = Lis\u00E4\u00E4 sis\u00E4lt\u00F6laatikko
sitepage.content.expire = Vanhenemisaika
sitepage.content.locale = N\u00E4yt\u00E4 kielell\u00E4
......@@ -1079,9 +962,7 @@ sitepage.edit = Muokkaa
sitepage.name = Sivun nimi
sitepage.roles = N\u00E4ytet\u00E4\u00E4n rooleille
sitepage.save = Tallenna
sitepagelist.header = Sivuston sis\u00E4ll\u00F6t
submenu.NotImplementedYet = Toteuttamatta
submenu.actionlog.messagelist = ActionLog
submenu.actionlog.taskview = N\u00E4yt\u00E4 toiminnat
......@@ -1178,19 +1059,15 @@ submenu.voting.compolist = Kilpailut
submenu.voting.create = Uusi kilpailu
submenu.voting.myEntries = Omat entryt
submenu.voting.submitEntry = L\u00E4het\u00E4 entry
subnavi.billing = Laskutus
subnavi.cards = Kortit
subnavi.info = Info
subnavi.products = Tuotteet
subnavi.readers = Lukijat
subnavi.roles = Roolit
success = Onnistui
supernavi.admin = Yll\u00E4piton\u00E4kym\u00E4
supernavi.user = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
svm.failure.errorMessage = Verkkomaksuvirhe.
svm.failure.successMessage = Maksuvirhe onnistunut. ( Maksu mahdollisesti merkitty jo maksetuksi )
svm.notification.errorMessage = Maksutapahtuma ep\u00E4onnistui
......@@ -1199,13 +1076,10 @@ svm.pending.errorMessage = Maksukuittausta odotetaan. Kuittauksesta l\u00
svm.pending.successMessage = Maksukuittausta odotetaan. Kuittauksesta l\u00E4hetet\u00E4\u00E4n ilmoitus s\u00E4hk\u00F6postitse.
svm.success.errorMessage = Verkkomaksua ei voitu verifioida! Virheest\u00E4 on raportoitu eteenp\u00E4in.
svm.success.successMessage = Verkkomaksu onnistui.
template.loggedInAs = Kirjautunut tunnuksella
topmenu.admin = Yll\u00E4piton\u00E4kym\u00E4
topmenu.helpdesk = Helpdesk
topmenu.user = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
topnavi.adminassoc = Verkkoassosioinnit
topnavi.adminlectures = Kurssit ja luennot
topnavi.adminshop = Kauppa
......@@ -1235,7 +1109,6 @@ topnavi.userlectures = Kurssit ja luennot
topnavi.usermgmt = K\u00E4ytt\u00E4j\u00E4t
topnavi.userplaces = Konepaikat
topnavi.usershop = Kauppa
tournament.admin.back_to_index = Takaisin turnauksen yll\u00E4pitosivulle
tournament.admin.control = Hallitse
tournament.admin.create = Luo uusi turnaus
......@@ -1284,7 +1157,6 @@ tournament.teammember.delete = Poista
tournament.teammember.login = Kirjautumistunnus
tournament.teammember.name = Nimi
tournament.type = Tyyppi
tournaments.accept_rules_and_participate = Hyv\u00E4ksyn s\u00E4\u00E4nn\u00F6t ja osallistun
tournaments.active_tournaments = Aktiiviset turnaukset
tournaments.add_backup_player_to_team = Lis\u00E4\u00E4 varaj\u00E4sen
......@@ -1346,7 +1218,6 @@ tournaments.tournament_details = Turnauksen yks
tournaments.tournament_gameplay = Peliasetukset
tournaments.tournament_name = Turnauksen nimi
tournaments.tournament_type = Turnauksen tyyppi
user.accountBalance = Tilin saldo
user.accountEventHeader = Tilitapahtumat
user.accountevents = Tilitapahtumat
......@@ -1452,11 +1323,8 @@ user.validateUser.header = Ole hyv\u00E4 ja sy\u00E4t\u00E4 kirjautumisti
user.wholeName = Nimi
user.wholename = Koko nimi
user.zipCode = Postinumero
userImport.commit = Hyv\u00E4ksy
userView.image = Kuva
usercart.addSearchedUsers = Lis\u00E4\u00E4 haetut k\u00E4ytt\u00E4j\u00E4t
usercart.cartsize = Koko
usercart.clear = Tyhjenn\u00E4 k\u00E4ytt\u00E4j\u00E4kori
......@@ -1465,9 +1333,7 @@ usercart.prev = Edellinen k\u00E4vij\u00E4
usercart.removeCurrent = Poista k\u00E4ytt\u00E4j\u00E4korista
usercart.showCart = K\u00E4ytt\u00E4j\u00E4kori
usercart.traverse = K\u00E4y l\u00E4pi
userimage.webcam = Ota kuva webkameralla
userlist.header = Etsi k\u00E4ytt\u00E4ji\u00E4
userlist.onlythisevent = Vain t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4j\u00E4t
userlist.placeassoc = Liitetty paikkaan
......@@ -1477,9 +1343,7 @@ userlist.search = Etsi
userlist.searchcount = Tuloksia
userlist.showAdvancedSearch = Tarkennettu haku
userlist.usersWithUnusedCodes = Lista t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4jist\u00E4, joilla on k\u00E4ytt\u00E4m\u00E4tt\u00F6mi\u00E4 paikkakoodeja
usertitle.managingUser = Kauppa
userview.invalidEmail = Virheeliinen s\u00E4hk\u00F6postiosoite
userview.loginstringFaulty = K\u00E4ytt\u00E4j\u00E4tunnus virheellinen. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n kaksi merkki\u00E4 pitk\u00E4.
userview.oldPasswordError = V\u00E4\u00E4r\u00E4 salasana!
......@@ -1487,12 +1351,9 @@ userview.passwordTooShort = Salasana liian lyhyt. Pit\u00E4\u00E4 olla v\u00E4
userview.passwordsChanged = Salasana vaihdettu
userview.passwordsDontMatch = Salasanat eiv\u00E4t ole samat! Ole hyv\u00E4 ja sy\u00F6t\u00E4 salasanat uudelleen.
userview.userExists = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Sinulla saattaa jo olla tunnus j\u00E4rjestelm\u00E4ss\u00E4.
viewexpired.body = Ole hyv\u00E4 ja kirjaudu sis\u00E4\u00E4n uudelleen.
viewexpired.title = N\u00E4kym\u00E4 on vanhentunut
viewlectures.title = Kurssit ja luennot
voting.allcompos.curEntries = Entryja
voting.allcompos.descri = Kuvaus
voting.allcompos.description = Compojen informaatiot.
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/shop/ProductView.java
package fi.codecrew.moya.web.cdiview.shop;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
......@@ -18,6 +19,7 @@ import fi.codecrew.moya.enums.apps.ShopPermission;
import fi.codecrew.moya.model.Discount;
import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.model.ProductFlag;
import fi.codecrew.moya.model.ProductLimitation;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
......@@ -40,12 +42,16 @@ public class ProductView extends GenericCDIView {
private transient ListDataModel<Discount> productDiscounts;
private ProductLimitation limit;
private ListDataModel<ProductLimitation> productLimits;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(ProductView.class);
public void initEditView() {
if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && product == null) {
product = prodbean.findById(getProductId());
product = prodbean.findById(productId);
if (super.requirePermissions(product != null)) {
super.beginConversation();
}
......@@ -108,6 +114,33 @@ public class ProductView extends GenericCDIView {
return "/product/createDiscount";
}
public String saveLimit()
{
if (product.getProductLimits() == null) {
product.setProductLimits(new ArrayList<ProductLimitation>());
}
if (!product.getProductLimits().contains(limit)) {
product.getProductLimits().add(limit);
}
prodbean.mergeChanges(product);
limit = null;
return "/product/edit";
}
public String initCreateLimit()
{
setLimit(new ProductLimitation());
getLimit().setProducts(new ArrayList<>(Arrays.asList(product)));
return "/product/editLimit";
}
public String editLimit()
{
limit = productLimits.getRowData();
return "/product/editLimit";
}
public String editDiscount()
{
discount = productDiscounts.getRowData();
......@@ -120,8 +153,22 @@ public class ProductView extends GenericCDIView {
return productDiscounts;
}
public ListDataModel<ProductLimitation> getProductLimits()
{
productLimits = new ListDataModel<ProductLimitation>(product.getProductLimits());
return productLimits;
}
public List<ProductFlag> getProductFlags()
{
return Arrays.asList(ProductFlag.values());
}
public ProductLimitation getLimit() {
return limit;
}
public void setLimit(ProductLimitation limit) {
this.limit = limit;
}
}
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/RoleDataView.java
......@@ -28,6 +28,11 @@ public class RoleDataView extends GenericCDIView {
private static final Logger logger = LoggerFactory.getLogger(RoleDataView.class);
public List<Role> getRoleList()
{
return rolebean.listRoles();
}
public ListDataModel<Role> getRoles() {
if (roles == null) {
roles = new ListDataModel<Role>(rolebean.listRoles());
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!