Skip to content

Riina Antikainen / Moya

Go to a project
Commit 4f3d0e0e by Tuomas Riihimäki
Options

Merge branch 'devel' of codecrew.fi:bortal into devel

2 parents 28a3b885 bd291409
Inline Side-by-side
Showing with 121 additions and 103 deletions
code/MoyaWeb/WebContent/admin/incoming/printCard.xhtml
......@@ -25,7 +25,7 @@
</h:panelGroup>
<h:panelGroup>
<h:form>
<h:outputLabel value="Kuvan rajaus:" />
<h:outputLabel value="#{i18n['user.cropUserImage']}:" />
<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" />
<br />
<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
......
code/MoyaWeb/WebContent/place/edit.xhtml
......@@ -63,7 +63,7 @@
</h:form>
<h2>Placegroup</h2>
<h2>#{i18n['editplace.placegroup.title']}</h2>
<h:panelGrid columns="2" rendered="#{empty placeView.place.group}">
<h:form id="usersearchform">
<h:outputText value="#{i18n['user.searchUser']}" />
......
code/MoyaWeb/src/ValidationMessages_en.properties
......@@ -4,6 +4,7 @@ actionlog.message.tooshort = Message is too short!
javax.validation.constraints.NotEmpty.message = Field cannot be empty
javax.validation.constraints.NotNull.message = Field can not be empty
user.cropUserImage = Crop image
user.emailregex = Field must contain an email address.
user.nickSizeMessage = Nick has to be at least {min} characters long.
......
code/MoyaWeb/src/ValidationMessages_fi.properties
user.nickSizeMessage=Nimimerkin pit olla vhintn {min} merkki pitk.
user.emailregex=Kentss pit olla shkpostiosoite.
javax.validation.constraints.NotNull.message=Kentt ei saa olla tyhj
actionlog.message.tooshort=Kahva ei kelpaa! (Viestisi on liian lyhyt :)
voting.create.participantsError=Osallistujia pit olla yksi tai enemmn.
voting.create.nameError=Nimen pit olla yli 3 merkki pitk.
javax.validation.constraints.NotEmpty.message=Kentt ei saa olla tyhj
actionlog.message.tooshort = Kahva ei kelpaa! (Viestisi on liian lyhyt :)
javax.validation.constraints.NotEmpty.message = Kentt\u00E4 ei saa olla tyhj\u00E4
javax.validation.constraints.NotNull.message = Kentt\u00E4 ei saa olla tyhj\u00E4
user.cropUserImage = Kuvan rajaus
user.emailregex = Kent\u00E4ss\u00E4 pit\u00E4\u00E4 olla s\u00E4hk\u00F6postiosoite.
user.nickSizeMessage = Nimimerkin pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n {min} merkki\u00E4 pitk\u00E4.
voting.create.nameError = Nimen pit\u00E4\u00E4 olla yli 3 merkki\u00E4 pitk\u00E4.
voting.create.participantsError = Osallistujia pit\u00E4\u00E4 olla yksi tai enemm\u00E4n.
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
......@@ -127,6 +127,9 @@ eventmap.active = Active
eventorg.create = Create
foodWave.closeNow = Close now
foodWave.openNow = Open now
game.active = Aktiivinen
game.codecount = Avattuja
game.codes.available = Lisenssikoodit
......@@ -149,6 +152,17 @@ global.save = Save
httpsession.creationTime = Created
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
login.login = Login
login.logout = Logout
login.logoutmessage = You have logged out of the system
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
......@@ -231,7 +231,8 @@ discount.shortdesc = Description
discount.validFrom = Valid from
discount.validTo = Valid to
editplace.header = Edit place
editplace.header = Edit place
editplace.placegroup.title = Placegroup
editplacegroup.header = Placegroup information
......@@ -296,9 +297,11 @@ food = Food
foodWave.accountevents = Accountevents
foodWave.activeFoodWaves = Active Foodwaves
foodWave.billLines = Pending Online Payments
foodWave.closeNow = Close now
foodWave.deliveredFoodWaves = Delivered Foodwaves
foodWave.list = Active Foodwaves
foodWave.name = Foodwave
foodWave.openNow = Open now
foodWave.orders = Amount of Orders
foodWave.paid = Paid
foodWave.show = Show
......@@ -422,13 +425,22 @@ 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.key = Private propery key
lanEventPrivateProperty.value = Private property value
lanEventPrivateProperty.createProperty = Create private property
lanEventPrivateProperty.defaultValue = Default value
lanEventPrivateProperty.editProperty = Edit property
lanEventPrivateProperty.key = Private propery key
lanEventPrivateProperty.save = Save
lanEventPrivateProperty.textValue = Text value
lanEventPrivateProperty.value = Private property value
lanEventPrivateProperty.valueIsRawdataWarning = Raw value
lanEventProperty.booleanValue = Boolean value
lanEventProperty.createProperty = Create property
lanEventProperty.defaultValue = Default value
lanEventProperty.editProperty = Edit property
lanEventProperty.key = Property key
lanEventProperty.save = Save
lanEventProperty.textValue = Text value
lanEventProperty.value = Property value
lanEventProperty.valueIsRawdataWarning = Raw data warning
......@@ -456,7 +468,7 @@ loginerror.message = Username of password incorrect.
loginerror.resetpassword = Reset password
map.create = Create map
map.createTimeMap = Create tilemap
map.createTileMap = Create tilemap
map.edit = Edit
map.generate = Generate places
map.height = Place height (px)
......@@ -502,17 +514,23 @@ menuitem.navigation.key = Product flag
nasty.user = Go away!
news.abstract = Abstract
news.expire = Expire
news.publish = Publish
news.save = Save
news.title = Title
newsgroup.edit = Edit
newsgroup.name = Newsgroup name
newsgroup.priority = Priority
newsgroup.readerRole = Reader roles
newsgroup.writerRole = Writer roles
news.abstract = Abstract
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
newsgroup.create_news = Create a news article
newsgroup.created = Newsgroup created
newsgroup.edit = Edit
newsgroup.name = Newsgroup name
newsgroup.priority = Priority
newsgroup.readerRole = Reader roles
newsgroup.save = Save
newsgroup.writerRole = Writer roles
newslist.header = Newsgroups
......@@ -616,6 +634,8 @@ place.commit = Save
place.description = Description
place.details = Details
place.edit = Edit
place.groupremove = Remove this place from the group
place.groupremove.confirm = Are you sure you want to remove this place from the group?
place.height = Height
place.id = ID
place.mapX = X
......@@ -623,7 +643,9 @@ place.mapY = Y
place.membership = Associated user
place.name = Name
place.product = Product
place.release = Release this place
place.releasetime = Releasetime
place.reserveForUser = Reserve for the user
place.width = Width
placeSelect.legend.blue = My selected place
......@@ -675,34 +697,8 @@ poll.end = Close poll
poll.name = Poll name
poll.save = Send answers
<<<<<<< HEAD
print = Print
product.barcode = Barcode
product.billed = Billed
product.boughtTotal = Products billed
product.buyInPrice = Buy in price
product.cart.count = To shoppingcart
product.cashed = Cashpaid
product.color = Color in UI
product.create = Create product
product.createDiscount = Add volumediscount
product.edit = edit
product.inventoryQuantity = Inventory count
product.name = Name of product
product.paid = Paid
product.prepaid = Prepaid
product.prepaidInstant = Created when prepaid is paid
product.price = Price of product
product.providedRole = Product defines role
product.save = Save
product.shopInstant = Create automatic cashpayment
product.sort = Sort nr
product.totalPrice = Total
product.unitName = Unit name
product.vat = VAT
=======
product.barcode = Barcode
product.billed = Billed
product.boughtTotal = Products billed
......@@ -736,7 +732,6 @@ productFlag.RESERVE_PLACE_WHEN_BOUGHT = Reserve place when bought
productFlag.USER_SHOPPABLE = User shoppable
products.create = Create product
>>>>>>> f4d8f93b7bc34f8ccc2a5df9f9ab5f8db5e3b11e
products.save = Save
productsShopView.readBarcode = Read
......@@ -889,6 +884,7 @@ submenu.orgrole.list = Organisation roles
submenu.pages.create = Create content
submenu.pages.list = List pages
submenu.place.adminPlacemap = Placemap
submenu.place.editGroup = Edit group
submenu.place.insertToken = Insert placecode
submenu.place.myGroups = Place reservations
submenu.place.placemap = Placemap
......@@ -984,7 +980,7 @@ user.changepassword.forUser = For user
user.changepassword.title = Change password
user.create = Create user
user.createdmessage = User has been created successfully. You can now login.
user.cropImage = Crop
user.cropImage = Crop image
user.defaultImage = Default picture
user.edit = Edit
user.edit.title = My information
......@@ -1026,6 +1022,8 @@ user.rolesave = Save roles
user.save = Save
user.saveFailed = Save failed, Not enough permissions!
user.saveSuccessfull = Changes saved successfully
user.search = Search
user.searchUser = Search user
user.sendPicture = Send image
user.sex = Sex
user.sex.FEMALE = Female
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
......@@ -232,7 +232,8 @@ discount.shortdesc = Kuvaus
discount.validFrom = Voimassa alkaen
discount.validTo = Voimassa asti
editplace.header = Muokkaa paikkaa
editplace.header = Muokkaa paikkaa
editplace.placegroup.title = Paikkaryhm\u00E4
editplacegroup.header = Paikkaryhm\u00E4n tiedot
......@@ -297,9 +298,11 @@ food = Ruoka
foodWave.accountevents = Maksetut tilaukset
foodWave.activeFoodWaves = Aktiiviset Ruokatilaukset
foodWave.billLines = Maksamattomat Verkkomaksut
foodWave.closeNow = Sulje nyt
foodWave.deliveredFoodWaves = Toimitetut Ruokatilaukset
foodWave.list = Ruokatilaukset
foodWave.name = Ruokatilaus
foodWave.openNow = Avaa nyt
foodWave.orders = Tilausten M\u00E4\u00E4r\u00E4
foodWave.paid = Maksettuja
foodWave.show = N\u00E4yt\u00E4
......@@ -432,13 +435,22 @@ 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.key = Ominaisuuden avain
lanEventPrivateProperty.value = Ominaisuuden arvo
lanEventPrivateProperty.createProperty = Luo yksityinen ominaisuus
lanEventPrivateProperty.defaultValue = Oletusarvo
lanEventPrivateProperty.editProperty = Muokkaa ominaisuutta
lanEventPrivateProperty.key = Ominaisuuden avain
lanEventPrivateProperty.save = Tallenna
lanEventPrivateProperty.textValue = Tekstiarvo
lanEventPrivateProperty.value = Ominaisuuden arvo
lanEventPrivateProperty.valueIsRawdataWarning = Raaka arvo
lanEventProperty.booleanValue = Totuusarvo
lanEventProperty.createProperty = Luo ominaisuus
lanEventProperty.defaultValue = Oletusarvo
lanEventProperty.editProperty = Muokkaa arvoa
lanEventProperty.key = Ominaisuuden avain
lanEventProperty.save = Tallenna
lanEventProperty.textValue = Tekstiarvo
lanEventProperty.value = Ominaisuuden arvo
lanEventProperty.valueIsRawdataWarning = Varoitus raakadatasta
......@@ -466,7 +478,7 @@ loginerror.message = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana ei ollut o
loginerror.resetpassword = Salasana unohtunut?
map.create = Luo kartta
map.createTimeMap = Luo tilekartta
map.createTileMap = Luo tilekartta
map.edit = Muokkaa
map.generate = Generoi paikat
map.height = Paikan korkeus (px)
......@@ -498,30 +510,36 @@ mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suorite
mapedit.save = Tallenna muutokset
menu.index = Etusivu
menu.name = Nimi
menu.place.placemap = Paikkakartta
menu.poll.index = Kyselyt
menu.select = Valitse
menu.shop.createBill = Kauppa
menu.sort = J\u00E4rjest\u00E4
menu.toAdmin = Yll\u00E4piton\u00E4kym\u00E4
menu.toUser = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
menu.user.edit = Omat tiedot
menu.index = Etusivu
menu.name = Nimi
menu.place.placemap = Paikkakartta
menu.poll.index = Kyselyt
menu.select = Valitse
menu.shop.createBill = Kauppa
menu.sort = J\u00E4rjest\u00E4
menu.toAdmin = Yll\u00E4piton\u00E4kym\u00E4
menu.toUser = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
menu.user.edit = Omat tiedot
nasty.user = Mene pois!
news.abstract = Lyhennelm\u00E4
news.expire = Lopeta julkaisu
news.publish = Julkaise
news.save = Tallenna
news.title = Otsikko
newsgroup.edit = Muokkaa
newsgroup.name = Uutisryhm\u00E4n nimi
newsgroup.priority = Painoarvo
newsgroup.readerRole = Lukijoiden roolit
newsgroup.writerRole = Kirjoittajaryhm\u00E4
news.abstract = Lyhennelm\u00E4
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
newsgroup.create_news = Luo uutinen
newsgroup.created = Uutisryhm\u00E4 luotu
newsgroup.edit = Muokkaa
newsgroup.name = Uutisryhm\u00E4n nimi
newsgroup.priority = Painoarvo
newsgroup.readerRole = Lukijoiden roolit
newsgroup.save = Tallenna
newsgroup.writerRole = Kirjoittajaryhm\u00E4
newslist.header = Uutisryhm\u00E4t
......@@ -599,6 +617,7 @@ place.description = Kuvaus
place.details = Tiedot
place.edit = Muokkaa
place.groupremove = Poista paikka paikkaryhm\u00E4st\u00E4
place.groupremove.confirm = Oletko varma, ett\u00E4 haluat poistaa konepaikan ryhm\u00E4st\u00E4.
place.height = Korkeus
place.id = ID
place.mapX = X
......@@ -607,7 +626,9 @@ place.membership = Yhdistetty k\u00E4ytt\u00E4j\u00E4
place.name = Nimi
place.noReserver = Ei liitetty k\u00E4ytt\u00E4j\u00E4\u00E4n
place.product = Tuote
place.release = Vapauta paikka
place.releasetime = Vapautusaika
place.reserveForUser = Varaa k\u00E4ytt\u00E4j\u00E4lle
place.width = Leveys
placeSelect.legend.blue = Oma valittu paikka
......@@ -659,31 +680,8 @@ poll.end = Sulje kysely
poll.name = Kyselyn nimi
poll.save = L\u00E4het\u00E4 vastauksesi
<<<<<<< HEAD
print = Tulosta
product.barcode = Viivakoodi
product.billed = Laskutettu
product.boughtTotal = Tuotteita laskutettu
product.cart.count = Ostoskoriin
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.edit = Muokkaa
product.inventoryQuantity = Varastotilanne
product.name = Tuotteen nimi
product.paid = Maksettu
product.prepaid = Prepaid
product.prepaidInstant = Luodaan kun prepaid maksetaan
product.price = Tuotteen hinta
product.save = Tallenna
product.shopInstant = Luo k\u00E4teismaksu tuotteille
product.sort = J\u00E4rjestys luku
product.totalPrice = Summa
product.unitName = Tuoteyksikk\u00F6
product.vat = ALV
=======
product.barcode = Viivakoodi
product.billed = Laskutettu
product.boughtTotal = Tuotteita laskutettu
......@@ -715,7 +713,6 @@ 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
>>>>>>> f4d8f93b7bc34f8ccc2a5df9f9ab5f8db5e3b11e
productShopView.readBarcode = Lue viivakoodi
......@@ -866,6 +863,7 @@ submenu.orgrole.list = J\u00E4rjest\u00E4j\u00E4roolit
submenu.pages.create = Luo sis\u00E4lt\u00F6\u00E4
submenu.pages.list = N\u00E4yt\u00E4 sis\u00E4ll\u00F6t
submenu.place.adminPlacemap = Konepaikat
submenu.place.editGroup = Muokkaa ryhm\u00E4\u00E4
submenu.place.insertToken = Sy\u00F6t\u00E4 paikkakoodi
submenu.place.myGroups = Omat paikkavaraukset
submenu.place.placemap = Paikkakartta
......@@ -1003,6 +1001,8 @@ user.realname = Nimi
user.roles = Roolit
user.rolesave = Tallenna roolit
user.save = Tallenna
user.search = Hae
user.searchUser = Hae k\u00E4ytt\u00E4j\u00E4\u00E4
user.sendPicture = Kuvan l\u00E4hetys
user.sex = Sukupuoli
user.sex.FEMALE = Nainen
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!