i18n

code/MoyaUtilities/src/fi/codecrew/moya/enums/TournamentStatus.java

@@ -4,4 +4,16 @@ public enum TournamentStatus {
 	SETUP,
 	IN_PROGRESS,
 	COMPLETED
+	;
+	
+	private final String key;
+	private static final String I18N_HEADER = "bortalApplication.tournamentstatus.";
+
+	private TournamentStatus() {
+		key = I18N_HEADER + name();
+	}
+
+	public String getI18nKey() {
+		return key;
+	}
 }

code/MoyaWeb/WebContent/tournaments/admin/index.xhtml

@@ -24,13 +24,13 @@
 					<f:facet name="header">
 						<h:outputText value="#{i18n['tournament.status']}" />
 					</f:facet>
-					<h:outputText value="#{tournament.tournamentStatus}" />
+					<h:outputText value="#{i18n[tournament.tournamentStatus.i18nKey]}" />
 				</p:column>
 				<p:column>
 					<f:facet name="header">
 						<h:outputText value="#{i18n['tournament.type']}" />
 					</f:facet>
-					<h:outputText value="#{tournament.tournamentType}" />
+					<h:outputText value="#{i18n[tournament.tournamentType.i18nKey]}" />
 				</p:column>
 				<p:column>
 					<f:facet name="header">

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties

@@ -159,6 +159,9 @@ bortalApplication.shop.SHOP_TO_OTHERS             = Shop to other users
 bortalApplication.terminal.CASHIER                = Access cashier terminal functions
 bortalApplication.terminal.CUSTOMER               = Access client terminal functions
 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.ANYUSER                    = All users have this anyways
 bortalApplication.user.CREATE_NEW                 = Create new user
@@ -987,6 +990,7 @@ topnavi.usershop     = Shop
 tournament.admin.create                         = Create new tournament
 tournament.create                               = Create tournament
 tournament.edit                                 = Edit tournament
+tournament.fillamount                           = Places taken
 tournament.game                                 = Game
 tournament.name                                 = Tournament name
 tournament.playerspermatch_slash_teamsize       = Players / team size

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

@@ -160,10 +160,13 @@ bortalApplication.shop.SHOP_TO_OTHERS             = Saa ostaa tuotteita muille
 bortalApplication.terminal.CASHIER                = Muokata rahastusp\u00E4\u00E4tteiden toimintoja
 bortalApplication.terminal.CUSTOMER               = Muokata k\u00E4vij\u00E4p\u00E4\u00E4tteiden toimintoja
 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.ANYUSER                    = AINA kaikilla k\u00E4ytt\u00E4jill\u00E4
 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.LOGIN                      = Voi kirjautua
 bortalApplication.user.LOGOUT                     = Voi uloskirjautua
@@ -970,6 +973,7 @@ topnavi.usershop     = Kauppa
 tournament.admin.create                         = Luo uusi turnaus
 tournament.create                               = Luo turnaus
 tournament.edit                                 = Muokkaa turnausta
+tournament.fillamount                           = Osallistujaa ilmottautunut
 tournament.game                                 = Peli
 tournament.name                                 = Turnauksen nimi
 tournament.playerspermatch_slash_teamsize       = Pelaajat / tiimin koko