1.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt Mon Sep 07 17:43:43 2009 +0200
1.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt Mon Sep 07 22:16:19 2009 +0200
1.3 @@ -9,7 +9,7 @@
1.4 </head>
1.5 <body>
1.6 <h1>${bundle.GAME}</h1>
1.7 - <h3>${doc.game.id.@white}${bundle.VS}${doc.game.id.@black}</h3>
1.8 + <h3>${bundle("players", doc.game.id.@white?string, doc.game.id.@black?string)}</h3>
1.9
1.10 <p>
1.11 <a href="/games/${doc.game.id.@id}">${bundle.RELOAD}</a>
1.12 @@ -25,13 +25,13 @@
1.13 <#assign play = false>
1.14
1.15 <#if doc.game.id.@result = "IN_PROGRESS" >
1.16 - ${bundle.MOVE_WHO} ${doc.game.@currentPlayer}
1.17 + ${bundle("MOVE_WHO", doc.game.@currentPlayer?string)}
1.18 <#assign play = user = doc.game.@currentPlayer>
1.19 <#else>
1.20 <#if doc.game.id.@result = "WHITE_WON">
1.21 - ${doc.game.id.@white} ${bundle.WON}
1.22 + ${bundle("WON", doc.game.id.@white?string)}
1.23 <#else>
1.24 - ${doc.game.id.@black} ${bundle.WON}
1.25 + ${bundle("WON", doc.game.id.@black?string)}
1.26 </#if>
1.27 </#if>
1.28 <#if play>
2.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.properties Mon Sep 07 17:43:43 2009 +0200
2.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.properties Mon Sep 07 22:16:19 2009 +0200
2.3 @@ -1,4 +1,4 @@
2.4 -VS= vs.
2.5 +players={0} vs. {1}
2.6 PLACE=Place!
2.7 MOVE=Move!
2.8 H=Horizontal
2.9 @@ -8,5 +8,5 @@
2.10 MOVENUMBER=#
2.11 MOVES=Moves
2.12 ROOT=Home
2.13 -MOVE_WHO=Who's turn
2.14 -WON=won
2.15 +MOVE_WHO=It is {0}'s turn.
2.16 +WON={0} won
3.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game_cs.properties Mon Sep 07 17:43:43 2009 +0200
3.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game_cs.properties Mon Sep 07 22:16:19 2009 +0200
3.3 @@ -1,4 +1,4 @@
3.4 -VS=/
3.5 +players={0} proti {1}
3.6 PLACE=Um\u00EDstit
3.7 MOVE=T\u00E1hnout
3.8 H=Horizont\u00E1ln\u011B
3.9 @@ -8,5 +8,5 @@
3.10 MOVENUMBER=Tah
3.11 MOVES=Z\u00E1pis
3.12 ROOT=Dom\u016F
3.13 -MOVE_WHO=Na tahu je
3.14 -WON=vyhr\u00E1l
3.15 +MOVE_WHO=Na tahu je {0}
3.16 +WON=Vyhr\u00E1l {0}
4.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Mon Sep 07 17:43:43 2009 +0200
4.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Mon Sep 07 22:16:19 2009 +0200
4.3 @@ -8,7 +8,7 @@
4.4 <h1>${bundle.TITLE}</h1>
4.5
4.6 <#macro game game>
4.7 - ${game.@white}${bundle.VS}${game.@black} <a href="/games/${game.@id}/">board</a>
4.8 + ${bundle("gameWhiteBlack", game.@white?string, game.@black?string)} <a href="/games/${game.@id}/">${bundle.BOARD}</a>
4.9 </#macro>
4.10
4.11 <#if message?? >
5.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.properties Mon Sep 07 17:43:43 2009 +0200
5.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.properties Mon Sep 07 22:16:19 2009 +0200
5.3 @@ -1,5 +1,6 @@
5.4 TITLE=Quoridor Community Server
5.5 -VS= vs.
5.6 +gameWhiteBlack={0} vs. {1}
5.7 +BOARD=QuoBoard
5.8 GAME_MOVE=Games where you are expected to move
5.9 GAME_WON=Won games
5.10 GAME_LOST=Lost Games
6.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index_cs.properties Mon Sep 07 17:43:43 2009 +0200
6.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index_cs.properties Mon Sep 07 22:16:19 2009 +0200
6.3 @@ -1,5 +1,6 @@
6.4 TITLE=Komunitn\u00ED server Quoridor
6.5 -VS=/
6.6 +gameWhiteBlack={0} proti {1}
6.7 +BOARD=Quoridornice
6.8 GAME_MOVE=Jsi na tahu...
6.9 GAME_WON=Vyhran\u00E9
6.10 GAME_LOST=Prohran\u00E9