Commit da5a9e7c by Tuukka Kivilahti

ui fixes for asm

1 parent c354f590
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<ui:fragment rendered="#{billEditView.bill.paid}"> <ui:fragment rendered="#{billEditView.bill.paid}">
<h:outputText value="#{i18n['bill.billIsPaid']}" /> <h:outputText value="#{i18n['bill.billIsPaid']}" />
<br /> <br /><br />
<h:outputText value="#{i18n['bill.billPaidDate']}" />: <h:outputText value="#{i18n['bill.billPaidDate']}" />:
<h:outputText value="#{billEditView.bill.paidDate}"> <h:outputText value="#{billEditView.bill.paidDate}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}"
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<h:outputText value="${i18n['bill.vat']}" /> <h:outputText value="${i18n['bill.vat']}" />
</f:facet> </f:facet>
<h:outputText value="#{bill.totalVat()}"> <h:outputText value="#{bill.totalVat()}">
<f:convertNumber currencyCode="EUR" maxFractionDigits="2" minFractionDigits="2" type="currency" /> <f:convertNumber currencyCode="EUR" maxFractionDigits="2" minFractionDigits="2" type="currency" locale="#{sessionHandler.locale}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column> <p:column>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<h:outputText value="${i18n['bill.totalPrice']}" /> <h:outputText value="${i18n['bill.totalPrice']}" />
</f:facet> </f:facet>
<h:outputText value="#{bill.totalPrice()}"> <h:outputText value="#{bill.totalPrice()}">
<f:convertNumber currencyCode="EUR" maxFractionDigits="2" minFractionDigits="2" type="currency" /> <f:convertNumber currencyCode="EUR" maxFractionDigits="2" minFractionDigits="2" type="currency" locale="#{sessionHandler.locale}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column rendered="#{(!bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING')) or billListView.canWriteBill}"> <p:column rendered="#{(!bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING')) or billListView.canWriteBill}">
...@@ -88,11 +88,13 @@ ...@@ -88,11 +88,13 @@
</h:link> </h:link>
</p:column> </p:column>
<p:column rendered="#{billListView.canWriteBill}"> <p:column rendered="#{billListView.canWriteBill}">
<p:commandButton onerror="location.reload(true)" rendered="#{bill.paidDate == null and billListView.showPayButtons}" action="#{billListView.markPaid()}" value="#{i18n['bill.markPaid']}" /> <p:commandButton update="billList" onerror="location.reload(true)" rendered="#{bill.paidDate == null and billListView.showPayButtons}" action="#{billListView.markPaid()}" value="#{i18n['bill.markPaid']}" />
<h:outputText rendered="#{bill.paidDate != null}" value="#{i18n['bill.isPaid']}" /> <h:outputText rendered="#{bill.paidDate != null}" value="#{i18n['bill.isPaid']}" />
<h:outputText rendered="#{bill.paidDate == null and !billListView.showPayButtons}" value="#{i18n['bill.isNotPaid']}" />
</p:column> </p:column>
<p:column rendered="#{!billListView.canWriteBill}"> <p:column rendered="#{!billListView.canWriteBill}">
<h:outputText rendered="#{bill.paidDate != null}" value="#{i18n['bill.isPaid']}" /> <h:outputText rendered="#{bill.paidDate != null}" value="#{i18n['bill.isPaid']}" />
<h:outputText rendered="#{bill.paidDate == null}" value="#{i18n['bill.isNotPaid']}" />
</p:column> </p:column>
</p:dataTable> </p:dataTable>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<h:outputText value="${i18n['product.price']}" /> <h:outputText value="${i18n['product.price']}" />
</f:facet> </f:facet>
<h:outputText id="price" value="#{cart.product.price.abs()}"> <h:outputText id="price" value="#{cart.product.price.abs()}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" /> <f:convertNumber maxFractionDigits="2" minFractionDigits="2" currencyCode="EUR" type="currency" locale="#{sessionHandler.locale}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
value="#{cart.count}"> value="#{cart.count}">
<f:ajax render="@form" <f:ajax render="@form"
listener="#{productShopView.countChangeListener}" /> listener="#{productShopView.countChangeListener}" />
<f:convertNumber maxFractionDigits="2" minFractionDigits="0" /> <f:convertNumber maxFractionDigits="2" minFractionDigits="0" />
</p:inputText> </p:inputText>
<h:commandButton action="#{productShopView.addOne}" <h:commandButton action="#{productShopView.addOne}"
value="#{i18n['productshop.plusOne']}"> value="#{i18n['productshop.plusOne']}">
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<h:outputText value="${i18n['product.totalPrice']}" /> <h:outputText value="${i18n['product.totalPrice']}" />
</f:facet> </f:facet>
<h:outputText id="total" value="#{cart.price}"> <h:outputText id="total" value="#{cart.price}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" /> <f:convertNumber maxFractionDigits="2" minFractionDigits="2" currencyCode="EUR" type="currency" locale="#{sessionHandler.locale}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:columnGroup type="footer"> <p:columnGroup type="footer">
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<p:column> <p:column>
<f:facet name="footer"> <f:facet name="footer">
<h:outputText value="#{productShopView.cartPrice}"> <h:outputText value="#{productShopView.cartPrice}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" /> <f:convertNumber maxFractionDigits="2" minFractionDigits="2" currencyCode="EUR" type="currency" locale="#{sessionHandler.locale}" />
</h:outputText> </h:outputText>
</f:facet> </f:facet>
</p:column> </p:column>
......
...@@ -80,10 +80,14 @@ public class SessionHandler { ...@@ -80,10 +80,14 @@ public class SessionHandler {
public String getLocale() { public String getLocale() {
Locale ret = sessionStore.getLocale(); Locale ret = sessionStore.getLocale();
String retStr = "fi_FI"; String retStr = "";
if (ret != null) { if (ret != null) {
retStr = ret.toLanguageTag(); retStr = ret.toLanguageTag();
} }
if(retStr.trim().equals(""))
retStr = "fi_FI";
return retStr; return retStr;
} }
......
...@@ -28,7 +28,7 @@ adduser.welcome = Welcome ...@@ -28,7 +28,7 @@ adduser.welcome = Welcome
adduser.welcometext = Here you can add new user or update your current user profile image. Please select desired action below. adduser.welcometext = Here you can add new user or update your current user profile image. Please select desired action below.
bill.billAmount = Amount bill.billAmount = Amount
bill.billNumber = Number bill.billNumber = Tilausnumero
bill.cancel = Cancel bill bill.cancel = Cancel bill
bill.expires = Expires bill.expires = Expires
bill.isExpired = Bill is expired bill.isExpired = Bill is expired
...@@ -311,7 +311,7 @@ page.bill.edit.header = Edit bill ...@@ -311,7 +311,7 @@ page.bill.edit.header = Edit bill
page.bill.list.header = Bills page.bill.list.header = Bills
page.bill.listAll.header = Bills page.bill.listAll.header = Bills
page.bill.placemap.header = Place map page.bill.placemap.header = Place map
page.bill.show.header = Bill info page.bill.show.header = Tilauksen tiedot
pagegroup.auth.login = frontpage pagegroup.auth.login = frontpage
...@@ -381,7 +381,7 @@ submenu.info.shop = Kauppa ...@@ -381,7 +381,7 @@ submenu.info.shop = Kauppa
submenu.lectureadmin.lectureParticipants = Tarkastele osallistujia submenu.lectureadmin.lectureParticipants = Tarkastele osallistujia
submenu.lectureadmin.manageLectureGroups = Hallinnoi submenu.lectureadmin.manageLectureGroups = Hallinnoi
submenu.lectures.viewLectures = Ilmoittaudu submenu.lectures.viewLectures = Ilmoittaudu
submenu.neomap.view = Paikkakartta submenu.neomap.view = Paikat
submenu.reports.basicStatistics = Tilastoja submenu.reports.basicStatistics = Tilastoja
subnavi.cards = \u0009\u0009 subnavi.cards = \u0009\u0009
...@@ -446,3 +446,12 @@ invite.permissionDenied=Sinulla ei ole oikeutta luovuttaa paikkaa eteenp\u00E4in ...@@ -446,3 +446,12 @@ invite.permissionDenied=Sinulla ei ole oikeutta luovuttaa paikkaa eteenp\u00E4in
invite.userLoginSuccessfull=Kutsu vastaanotettu onnistuneesti invite.userLoginSuccessfull=Kutsu vastaanotettu onnistuneesti
invite.userLoginUnSuccessfull=Kirjautuminen ep\u00E4onnistui invite.userLoginUnSuccessfull=Kirjautuminen ep\u00E4onnistui
placegroupview.placetransferred=Paikka annettu eteenp\u00E4in placegroupview.placetransferred=Paikka annettu eteenp\u00E4in
shop.create=
submenu.shop.createBill=Osta lippuja
submenu.shop.listReaders=
submenu.shop.shopToUser=
submenu.shop.showReaderEvents=
submenu.tournaments.admin.index=
submenu.bill.billSummary=
placegroupview.reservationProduct=
bill.isNoPaid=Maksamatta
...@@ -65,11 +65,11 @@ bill.addr5 = Address 5 ...@@ -65,11 +65,11 @@ bill.addr5 = Address 5
bill.address = Payers address bill.address = Payers address
bill.allowStatistics = My information can be used in statistics bill.allowStatistics = My information can be used in statistics
bill.billAmount = Bill amount (inc. vat) bill.billAmount = Bill amount (inc. vat)
bill.billIsPaid = Bill is paid bill.billIsPaid = Order is paid
bill.billLines = Products bill.billLines = Products
bill.billMarkedPaidMail.message = Your deposit number {0} has been marked as paid. bill.billMarkedPaidMail.message = Your deposit number {0} has been marked as paid.
bill.billMarkedPaidMail.subject = Bill marked paid bill.billMarkedPaidMail.subject = Bill marked paid
bill.billNumber = Number bill.billNumber = Order number
bill.billPaidDate = Paid date bill.billPaidDate = Paid date
bill.cancel = Cancel bill bill.cancel = Cancel bill
bill.deliveryTerms = Delivery terms bill.deliveryTerms = Delivery terms
...@@ -797,7 +797,7 @@ page.bill.edit.header = Edit bill ...@@ -797,7 +797,7 @@ page.bill.edit.header = Edit bill
page.bill.list.header = Bills page.bill.list.header = Bills
page.bill.listAll.header = Bills page.bill.listAll.header = Bills
page.bill.placemap.header = Place map page.bill.placemap.header = Place map
page.bill.show.header = Bill info page.bill.show.header = Order info
page.checkout.cancel.header = Payment cancelled! page.checkout.cancel.header = Payment cancelled!
page.checkout.delayed.header = Delayed payment page.checkout.delayed.header = Delayed payment
page.checkout.reject.header = Payment rejected! page.checkout.reject.header = Payment rejected!
...@@ -915,7 +915,7 @@ placegroupview.placeReleaseFailed = Releasing of place failed! ...@@ -915,7 +915,7 @@ placegroupview.placeReleaseFailed = Releasing of place failed!
placegroupview.placeReleased = Place {0} released placegroupview.placeReleased = Place {0} released
placegroupview.releasePlace = Release placegroupview.releasePlace = Release
placegroupview.reservationName = Place placegroupview.reservationName = Place
placegroupview.reservationProduct = Product placegroupview.reservationProduct = Ticket
placegroupview.token = Placecode / user placegroupview.token = Placecode / user
placetoken.commit = Associate token placetoken.commit = Associate token
...@@ -946,7 +946,7 @@ product.barcode = Barcode ...@@ -946,7 +946,7 @@ product.barcode = Barcode
product.billed = Billed product.billed = Billed
product.boughtTotal = Products billed product.boughtTotal = Products billed
product.buyInPrice = Buy in price product.buyInPrice = Buy in price
product.cart.count = To shoppingcart product.cart.count = Count
product.cashed = Cashpaid product.cashed = Cashpaid
product.color = Color in UI product.color = Color in UI
product.create = Create product product.create = Create product
...@@ -1181,7 +1181,7 @@ submenu.auth.logout = Logout ...@@ -1181,7 +1181,7 @@ submenu.auth.logout = Logout
submenu.auth.logoutResponse = Logout successfull submenu.auth.logoutResponse = Logout successfull
submenu.auth.sendResetMail = Password reset submenu.auth.sendResetMail = Password reset
submenu.bill.billSummary = Bill summary submenu.bill.billSummary = Bill summary
submenu.bill.list = My bills submenu.bill.list = My orders
submenu.bill.listAll = All bills submenu.bill.listAll = All bills
submenu.eventorg.editEvent = Edit event submenu.eventorg.editEvent = Edit event
submenu.eventorg.list = Manage Event submenu.eventorg.list = Manage Event
...@@ -1203,7 +1203,7 @@ submenu.license.manageCodes = Manage codes ...@@ -1203,7 +1203,7 @@ submenu.license.manageCodes = Manage codes
submenu.license.viewCodes = View codes submenu.license.viewCodes = View codes
submenu.map.create = Create map submenu.map.create = Create map
submenu.map.list = List maps submenu.map.list = List maps
submenu.neomap.view = Map submenu.neomap.view = Places
submenu.networkassociation.index = Associations submenu.networkassociation.index = Associations
submenu.orgrole.create = Create organisationrole submenu.orgrole.create = Create organisationrole
submenu.orgrole.list = Organisation roles submenu.orgrole.list = Organisation roles
...@@ -1221,7 +1221,7 @@ submenu.product.list = List products ...@@ -1221,7 +1221,7 @@ submenu.product.list = List products
submenu.reports.basicStatistics = Statistics submenu.reports.basicStatistics = Statistics
submenu.role.create = Create role submenu.role.create = Create role
submenu.role.list = Show Roles submenu.role.list = Show Roles
submenu.shop.createBill = Purchase submenu.shop.createBill = Purchase tickets
submenu.shop.listReaders = List readers submenu.shop.listReaders = List readers
submenu.shop.shopToUser = Shop to user submenu.shop.shopToUser = Shop to user
submenu.shop.showReaderEvents = Reader events submenu.shop.showReaderEvents = Reader events
...@@ -1644,3 +1644,4 @@ invite.permissionDenied=You don't have permission to regive this place. ...@@ -1644,3 +1644,4 @@ invite.permissionDenied=You don't have permission to regive this place.
invite.userLoginSuccessfull=Invite accepted successfully invite.userLoginSuccessfull=Invite accepted successfully
invite.userLoginUnSuccessfull=Login unsuccessfull invite.userLoginUnSuccessfull=Login unsuccessfull
placegroupview.placetransferred=Place is transferred placegroupview.placetransferred=Place is transferred
bill.isNoPaid=Not paid
...@@ -65,11 +65,11 @@ bill.addr5 = Osoite 5 ...@@ -65,11 +65,11 @@ bill.addr5 = Osoite 5
bill.address = Maksajan osoite bill.address = Maksajan osoite
bill.allowStatistics = Tietoni saa julkaista tilastoissa bill.allowStatistics = Tietoni saa julkaista tilastoissa
bill.billAmount = Laskun summa (sis. alv) bill.billAmount = Laskun summa (sis. alv)
bill.billIsPaid = Lasku on maksettu bill.billIsPaid = Tilaus on maksettu
bill.billLines = Tuotteet bill.billLines = Tuotteet
bill.billMarkedPaidMail.message = Laskusi numero {0} on merkitty maksetuksi. Voit nyt siirty\u00E4 lippukauppaan varamaan haluamasi paikat. Tervetuloa tapahtumaan! bill.billMarkedPaidMail.message = Laskusi numero {0} on merkitty maksetuksi. Voit nyt siirty\u00E4 lippukauppaan varamaan haluamasi paikat. Tervetuloa tapahtumaan\!
bill.billMarkedPaidMail.subject = Lasku merkitty maksetuksi bill.billMarkedPaidMail.subject = Lasku merkitty maksetuksi
bill.billNumber = Numero bill.billNumber = Tilausnumero
bill.billPaidDate = Maksup\u00E4iv\u00E4 bill.billPaidDate = Maksup\u00E4iv\u00E4
bill.cancel = Peruuta lasku bill.cancel = Peruuta lasku
bill.deliveryTerms = Toimitusehdot bill.deliveryTerms = Toimitusehdot
...@@ -806,7 +806,7 @@ page.bill.edit.header = Muokkaa laskua ...@@ -806,7 +806,7 @@ page.bill.edit.header = Muokkaa laskua
page.bill.list.header = Laskut page.bill.list.header = Laskut
page.bill.listAll.header = Laskut page.bill.listAll.header = Laskut
page.bill.placemap.header = Paikkakartta page.bill.placemap.header = Paikkakartta
page.bill.show.header = Laskun tiedot page.bill.show.header = Tilauksen tiedot
page.checkout.cancel.header = Maksu peruutettu. page.checkout.cancel.header = Maksu peruutettu.
page.checkout.delayed.header = Viiv\u00E4stetty maksu page.checkout.delayed.header = Viiv\u00E4stetty maksu
page.checkout.reject.header = Maksu hyl\u00E4tty! page.checkout.reject.header = Maksu hyl\u00E4tty!
...@@ -898,7 +898,7 @@ placegroupview.placeReleaseFailed = Paikan vapauttaminen ep\u00E4onnistui! ...@@ -898,7 +898,7 @@ placegroupview.placeReleaseFailed = Paikan vapauttaminen ep\u00E4onnistui!
placegroupview.placeReleased = Paikka {0} vapautettu placegroupview.placeReleased = Paikka {0} vapautettu
placegroupview.releasePlace = Vapauta placegroupview.releasePlace = Vapauta
placegroupview.reservationName = Paikka placegroupview.reservationName = Paikka
placegroupview.reservationProduct = Tuote placegroupview.reservationProduct = Lippu
placegroupview.token = Paikkakoodi / k\u00E4ytt\u00E4j\u00E4 placegroupview.token = Paikkakoodi / k\u00E4ytt\u00E4j\u00E4
placetoken.commit = Liit\u00E4 placetoken.commit = Liit\u00E4
...@@ -929,7 +929,7 @@ product.barcode = Viivakoodi ...@@ -929,7 +929,7 @@ product.barcode = Viivakoodi
product.billed = Laskutettu product.billed = Laskutettu
product.boughtTotal = Tuotteita laskutettu product.boughtTotal = Tuotteita laskutettu
product.buyInPrice = Sis\u00E4\u00E4nostohinta product.buyInPrice = Sis\u00E4\u00E4nostohinta
product.cart.count = Ostoskoriin product.cart.count = M\u00E4\u00E4r\u00E4
product.cashed = Ostettu k\u00E4teisell\u00E4 product.cashed = Ostettu k\u00E4teisell\u00E4
product.color = V\u00E4ri k\u00E4ytt\u00F6liittym\u00E4ss\u00E4 product.color = V\u00E4ri k\u00E4ytt\u00F6liittym\u00E4ss\u00E4
product.create = Luo tuote product.create = Luo tuote
...@@ -1161,7 +1161,7 @@ submenu.auth.logout = Kirjaudu ulos ...@@ -1161,7 +1161,7 @@ submenu.auth.logout = Kirjaudu ulos
submenu.auth.logoutResponse = Uloskirjautuminen onnistui submenu.auth.logoutResponse = Uloskirjautuminen onnistui
submenu.auth.sendResetMail = Salasanan palautus submenu.auth.sendResetMail = Salasanan palautus
submenu.bill.billSummary = Laskujen yhteenveto submenu.bill.billSummary = Laskujen yhteenveto
submenu.bill.list = N\u00E4yt\u00E4 omat laskut submenu.bill.list = N\u00E4yt\u00E4 omat tilaukset
submenu.bill.listAll = Kaikki laskut submenu.bill.listAll = Kaikki laskut
submenu.eventorg.editEvent = Tapahtuman tiedot submenu.eventorg.editEvent = Tapahtuman tiedot
submenu.eventorg.list = Organisaation hallinta submenu.eventorg.list = Organisaation hallinta
...@@ -1183,7 +1183,7 @@ submenu.license.manageCodes = Hallinnoi lisenssej\u00E4 ...@@ -1183,7 +1183,7 @@ submenu.license.manageCodes = Hallinnoi lisenssej\u00E4
submenu.license.viewCodes = N\u00E4yt\u00E4 koodit submenu.license.viewCodes = N\u00E4yt\u00E4 koodit
submenu.map.create = Uusi kartta submenu.map.create = Uusi kartta
submenu.map.list = N\u00E4yt\u00E4 kartat submenu.map.list = N\u00E4yt\u00E4 kartat
submenu.neomap.view = Paikkakartta submenu.neomap.view = Paikat
submenu.networkassociation.index = Assosiaatiot submenu.networkassociation.index = Assosiaatiot
submenu.orgrole.create = Luo j\u00E4rjest\u00E4j\u00E4rooli submenu.orgrole.create = Luo j\u00E4rjest\u00E4j\u00E4rooli
submenu.orgrole.list = J\u00E4rjest\u00E4j\u00E4roolit submenu.orgrole.list = J\u00E4rjest\u00E4j\u00E4roolit
...@@ -1201,7 +1201,7 @@ submenu.product.list = Listaa tuotteet ...@@ -1201,7 +1201,7 @@ submenu.product.list = Listaa tuotteet
submenu.reports.basicStatistics = Tilastoja submenu.reports.basicStatistics = Tilastoja
submenu.role.create = Luo rooli submenu.role.create = Luo rooli
submenu.role.list = N\u00E4yt\u00E4 roolit submenu.role.list = N\u00E4yt\u00E4 roolit
submenu.shop.createBill = Osta tuotteita submenu.shop.createBill = Osta lippuja
submenu.shop.listReaders = N\u00E4yt\u00E4 lukijat submenu.shop.listReaders = N\u00E4yt\u00E4 lukijat
submenu.shop.shopToUser = Osta k\u00E4ytt\u00E4j\u00E4lle submenu.shop.shopToUser = Osta k\u00E4ytt\u00E4j\u00E4lle
submenu.shop.showReaderEvents = Lukijan tapahtumat submenu.shop.showReaderEvents = Lukijan tapahtumat
...@@ -1625,3 +1625,4 @@ invite.permissionDenied=Sinulla ei ole oikeutta luovuttaa paikkaa eteenp\u00E4in ...@@ -1625,3 +1625,4 @@ invite.permissionDenied=Sinulla ei ole oikeutta luovuttaa paikkaa eteenp\u00E4in
invite.userLoginSuccessfull=Kutsu vastaanotettu onnistuneesti invite.userLoginSuccessfull=Kutsu vastaanotettu onnistuneesti
invite.userLoginUnSuccessfull=Kirjautuminen ep\u00E4onnistui invite.userLoginUnSuccessfull=Kirjautuminen ep\u00E4onnistui
placegroupview.placetransferred=Paikka on annettu eteenp\u00E4in. placegroupview.placetransferred=Paikka on annettu eteenp\u00E4in.
bill.isNoPaid=Maksamatta
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!