Skip to content

Linnea Samila / Moya

Go to a project
Commit 613ebaee by Juho Salli
Options

compolist monikielinen

1 parent 3e97d598
Inline Side-by-side
Showing with 34 additions and 12 deletions
code/LanBortalWeb/WebContent/voting/compolist.xhtml
...@@ -23,31 +23,31 @@ ...@@ -23,31 +23,31 @@
<h:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{votingCompoListView.compos}" var="compo"> <h:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{votingCompoListView.compos}" var="compo">
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Name" /> <h:outputText value="#{i18n['voting.allcompos.name']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.name}" /> <h:outputText value="#{compo.name}" />
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Kuvaus" /> <h:outputText value="#{i18n['voting.allcompos.descri']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.description}" /> <h:outputText value="#{compo.description}" />
</h:column> </h:column>
<h:column rendered="#{votingCompoListView.curEntries}"> <h:column rendered="#{votingCompoListView.curEntries}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="current entries" /> <h:outputText value="#{i18n['voting.allcompos.curEntries']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.compoEntries.size()}" /> <h:outputText value="#{compo.compoEntries.size()}" />
</h:column> </h:column>
<h:column rendered="#{votingCompoListView.maxParts}"> <h:column rendered="#{votingCompoListView.maxParts}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Max parts" /> <h:outputText value="#{i18n['voting.allcompos.maxParts']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.maxParticipantCount}" /> <h:outputText value="#{compo.maxParticipantCount}" />
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Start time" /> <h:outputText value="#{i18n['voting.allcompos.startTime']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.startTime.time}" > <h:outputText value="#{compo.startTime.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" /> <f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header" > <f:facet name="header" >
<h:outputText value="End time" /> <h:outputText value="#{i18n['voting.allcompos.endTime']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.endTime.time}" > <h:outputText value="#{compo.endTime.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" /> <f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header" > <f:facet name="header" >
<h:outputText value="Vote start" /> <h:outputText value="#{i18n['voting.allcompos.voteStart']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.voteStart.time}" > <h:outputText value="#{compo.voteStart.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" /> <f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header" > <f:facet name="header" >
<h:outputText value="Vote end" /> <h:outputText value="#{i18n['voting.allcompos.voteEnd']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.voteEnd.time}" > <h:outputText value="#{compo.voteEnd.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" /> <f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Submit start" /> <h:outputText value="#{i18n['voting.allcompos.submitStart']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.submitStart.time}" > <h:outputText value="#{compo.submitStart.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" /> <f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Submit end" /> <h:outputText value="#{i18n['voting.allcompos.submitEnd']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.submitEnd.time}" > <h:outputText value="#{compo.submitEnd.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" /> <f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
...@@ -95,11 +95,11 @@ ...@@ -95,11 +95,11 @@
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Submit entry" /> <h:outputText value="" />
</f:facet> </f:facet>
<h:link outcome="addentry"> <h:link outcome="addentry">
<f:param name="compoId" value="#{compo.id}" /> <f:param name="compoId" value="#{compo.id}" />
Submit entry #{i18n['voting.allcompos.submitEntry']}
</h:link> </h:link>
</h:column> </h:column>
</h:dataTable> </h:dataTable>
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
...@@ -526,8 +526,19 @@ userview.userExists = Username already exists! please select another. ...@@ -526,8 +526,19 @@ userview.userExists = Username already exists! please select another.
viewexpired.body = Please login again. viewexpired.body = Please login again.
viewexpired.title = Login expired. Please login again. viewexpired.title = Login expired. Please login again.
voting.allcompos.curEntries = # of entries
voting.allcompos.descri = Description
voting.allcompos.description = List of all compos and NIIDEN information. voting.allcompos.description = List of all compos and NIIDEN information.
voting.allcompos.endTime = End time
voting.allcompos.header = All compos voting.allcompos.header = All compos
voting.allcompos.maxParts = Max participants
voting.allcompos.name = Name
voting.allcompos.startTime = Start time
voting.allcompos.submitEnd = Submit end
voting.allcompos.submitEntry = Submit entry
voting.allcompos.submitStart = Submit start
voting.allcompos.voteEnd = Vote end
voting.allcompos.voteStart = Vote start
voting.create.compoEnd = End time voting.create.compoEnd = End time
voting.create.compoStart = Start time voting.create.compoStart = Start time
voting.create.createButton = Create voting.create.createButton = Create
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -516,8 +516,19 @@ userview.userExists = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole ...@@ -516,8 +516,19 @@ userview.userExists = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole
viewexpired.body = Ole hyv\u00E4 ja kirjaudu sis\u00E4\u00E4n uudelleen. viewexpired.body = Ole hyv\u00E4 ja kirjaudu sis\u00E4\u00E4n uudelleen.
viewexpired.title = N\u00E4kym\u00E4 on vanhentunut viewexpired.title = N\u00E4kym\u00E4 on vanhentunut
voting.allcompos.curEntries = Entryja
voting.allcompos.descri = Kuvaus
voting.allcompos.description = Compojen informaatiot. voting.allcompos.description = Compojen informaatiot.
voting.allcompos.endTime = Lopetusaika
voting.allcompos.header = Kaikki compot voting.allcompos.header = Kaikki compot
voting.allcompos.maxParts = Max osallistujam\u00E4\u00E4r\u00E4
voting.allcompos.name = Nimi
voting.allcompos.startTime = Aloitusaika
voting.allcompos.submitEnd = Lis\u00E4ys kiinni
voting.allcompos.submitEntry = L\u00E4het\u00E4 entry
voting.allcompos.submitStart = Lis\u00E4ys auki
voting.allcompos.voteEnd = \u00C4\u00E4nestys kiinni
voting.allcompos.voteStart = \u00C4\u00E4nestys auki
voting.create.compoEnd = Lopetusaika voting.create.compoEnd = Lopetusaika
voting.create.compoStart = Aloitusaika voting.create.compoStart = Aloitusaika
voting.create.createButton = Luo voting.create.createButton = Luo
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!