1.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt Mon Sep 07 17:02:59 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>