Commit 2980d60c by Antti Jaakkola

i18n

1 parent 6ef8b6d5
...@@ -4,4 +4,16 @@ public enum TournamentStatus { ...@@ -4,4 +4,16 @@ public enum TournamentStatus {
SETUP, SETUP,
IN_PROGRESS, IN_PROGRESS,
COMPLETED COMPLETED
;
private final String key;
private static final String I18N_HEADER = "bortalApplication.tournamentstatus.";
private TournamentStatus() {
key = I18N_HEADER + name();
}
public String getI18nKey() {
return key;
}
} }
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['tournament.status']}" /> <h:outputText value="#{i18n['tournament.status']}" />
</f:facet> </f:facet>
<h:outputText value="#{tournament.tournamentStatus}" /> <h:outputText value="#{i18n[tournament.tournamentStatus.i18nKey]}" />
</p:column> </p:column>
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['tournament.type']}" /> <h:outputText value="#{i18n['tournament.type']}" />
</f:facet> </f:facet>
<h:outputText value="#{tournament.tournamentType}" /> <h:outputText value="#{i18n[tournament.tournamentType.i18nKey]}" />
</p:column> </p:column>
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
......
...@@ -159,6 +159,9 @@ bortalApplication.shop.SHOP_TO_OTHERS = Shop to other users ...@@ -159,6 +159,9 @@ bortalApplication.shop.SHOP_TO_OTHERS = Shop to other users
bortalApplication.terminal.CASHIER = Access cashier terminal functions bortalApplication.terminal.CASHIER = Access cashier terminal functions
bortalApplication.terminal.CUSTOMER = Access client terminal functions bortalApplication.terminal.CUSTOMER = Access client terminal functions
bortalApplication.terminal.SELFHELP = Self help terminal bortalApplication.terminal.SELFHELP = Self help terminal
bortalApplication.tournamentstatus.COMPLETED = Completed
bortalApplication.tournamentstatus.IN_PROGRESS = In progress
bortalApplication.tournamentstatus.SETUP = Setup
bortalApplication.user = User permissions bortalApplication.user = User permissions
bortalApplication.user.ANYUSER = All users have this anyways bortalApplication.user.ANYUSER = All users have this anyways
bortalApplication.user.CREATE_NEW = Create new user bortalApplication.user.CREATE_NEW = Create new user
...@@ -987,6 +990,7 @@ topnavi.usershop = Shop ...@@ -987,6 +990,7 @@ topnavi.usershop = Shop
tournament.admin.create = Create new tournament tournament.admin.create = Create new tournament
tournament.create = Create tournament tournament.create = Create tournament
tournament.edit = Edit tournament tournament.edit = Edit tournament
tournament.fillamount = Places taken
tournament.game = Game tournament.game = Game
tournament.name = Tournament name tournament.name = Tournament name
tournament.playerspermatch_slash_teamsize = Players / team size tournament.playerspermatch_slash_teamsize = Players / team size
......
...@@ -160,10 +160,13 @@ bortalApplication.shop.SHOP_TO_OTHERS = Saa ostaa tuotteita muille ...@@ -160,10 +160,13 @@ bortalApplication.shop.SHOP_TO_OTHERS = Saa ostaa tuotteita muille
bortalApplication.terminal.CASHIER = Muokata rahastusp\u00E4\u00E4tteiden toimintoja bortalApplication.terminal.CASHIER = Muokata rahastusp\u00E4\u00E4tteiden toimintoja
bortalApplication.terminal.CUSTOMER = Muokata k\u00E4vij\u00E4p\u00E4\u00E4tteiden toimintoja bortalApplication.terminal.CUSTOMER = Muokata k\u00E4vij\u00E4p\u00E4\u00E4tteiden toimintoja
bortalApplication.terminal.SELFHELP = Itsepalvelup\u00E4\u00E4te bortalApplication.terminal.SELFHELP = Itsepalvelup\u00E4\u00E4te
bortalApplication.tournamentstatus.COMPLETED = P\u00E4\u00E4ttynyt
bortalApplication.tournamentstatus.IN_PROGRESS = K\u00E4ynniss\u00E4
bortalApplication.tournamentstatus.SETUP = Valmistelussa
bortalApplication.user = K\u00E4ytt\u00E4j\u00E4oikeudet bortalApplication.user = K\u00E4ytt\u00E4j\u00E4oikeudet
bortalApplication.user.ANYUSER = AINA kaikilla k\u00E4ytt\u00E4jill\u00E4 bortalApplication.user.ANYUSER = AINA kaikilla k\u00E4ytt\u00E4jill\u00E4
bortalApplication.user.CREATE_NEW = Voi luoda uuden k\u00E4ytt\u00E4j\u00E4n bortalApplication.user.CREATE_NEW = Voi luoda uuden k\u00E4ytt\u00E4j\u00E4n
bortalApplication.user.INVITE_USERS = Voi kutsua k\u00E4ytt\u00E4j\u00E4ksi bortalApplication.user.INVITE_USERS = Voi kutsua yst\u00E4vi\u00E4
bortalApplication.user.LOGGED_IN_USER = Kirjautunut k\u00E4ytt\u00E4j\u00E4 bortalApplication.user.LOGGED_IN_USER = Kirjautunut k\u00E4ytt\u00E4j\u00E4
bortalApplication.user.LOGIN = Voi kirjautua bortalApplication.user.LOGIN = Voi kirjautua
bortalApplication.user.LOGOUT = Voi uloskirjautua bortalApplication.user.LOGOUT = Voi uloskirjautua
...@@ -970,6 +973,7 @@ topnavi.usershop = Kauppa ...@@ -970,6 +973,7 @@ topnavi.usershop = Kauppa
tournament.admin.create = Luo uusi turnaus tournament.admin.create = Luo uusi turnaus
tournament.create = Luo turnaus tournament.create = Luo turnaus
tournament.edit = Muokkaa turnausta tournament.edit = Muokkaa turnausta
tournament.fillamount = Osallistujaa ilmottautunut
tournament.game = Peli tournament.game = Peli
tournament.name = Turnauksen nimi tournament.name = Turnauksen nimi
tournament.playerspermatch_slash_teamsize = Pelaajat / tiimin koko tournament.playerspermatch_slash_teamsize = Pelaajat / tiimin koko
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!