1.1 --- a/freemarkerdor/pom.xml Thu Nov 19 09:25:45 2009 +0100
1.2 +++ b/freemarkerdor/pom.xml Thu Nov 19 09:35:29 2009 +0100
1.3 @@ -10,7 +10,7 @@
1.4 <groupId>org.apidesign</groupId>
1.5 <artifactId>freemarkerdor</artifactId>
1.6 <name>freemarkerdor</name>
1.7 - <version>1.40</version>
1.8 + <version>1.41</version>
1.9 <url>http://maven.apache.org</url>
1.10 <dependencies>
1.11 <dependency>
2.1 --- a/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java Thu Nov 19 09:25:45 2009 +0100
2.2 +++ b/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java Thu Nov 19 09:35:29 2009 +0100
2.3 @@ -29,7 +29,6 @@
2.4 import com.sun.jersey.api.client.Client;
2.5 import com.sun.jersey.api.client.UniformInterfaceException;
2.6 import com.sun.jersey.api.client.WebResource;
2.7 -import com.sun.jersey.api.client.config.DefaultClientConfig;
2.8 import com.sun.jersey.api.container.httpserver.HttpServerFactory;
2.9 import com.sun.jersey.api.core.PackagesResourceConfig;
2.10 import com.sun.jersey.api.core.ResourceConfig;
3.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/Bundle.properties Thu Nov 19 09:25:45 2009 +0100
3.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/Bundle.properties Thu Nov 19 09:35:29 2009 +0100
3.3 @@ -18,8 +18,8 @@
3.4 } ago
3.5 GAME_MOVE=Your move
3.6 GAME_WAIT=Opponent's move
3.7 -GAME_WON=Won games
3.8 -GAME_LOST=Lost games
3.9 +GAME_WON=Won games ({0})
3.10 +GAME_LOST=Lost games ({0})
3.11 CREATE=Create!
3.12 GAME_ALL=All games
3.13 WHITE=White
4.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/Bundle_cs.properties Thu Nov 19 09:25:45 2009 +0100
4.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/Bundle_cs.properties Thu Nov 19 09:35:29 2009 +0100
4.3 @@ -8,8 +8,8 @@
4.4 gameWhiteBlack={0} proti {1}
4.5 GAME_MOVE=Na tahu
4.6 GAME_WAIT=\u010Cek\u00E1 se na tah
4.7 -GAME_WON=Vyhran\u00E9
4.8 -GAME_LOST=Prohran\u00E9
4.9 +GAME_WON=Vyhran\u00E9 ({0})
4.10 +GAME_LOST=Prohran\u00E9 ({0})
4.11 CREATE=Vytvo\u0159 novou
4.12 GAME_ALL=V\u0161echny hry
4.13 WHITE=B\u00EDl\u00FD
5.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Thu Nov 19 09:25:45 2009 +0100
5.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Thu Nov 19 09:35:29 2009 +0100
5.3 @@ -68,7 +68,7 @@
5.4 </#if>
5.5
5.6 <#if (toMove > 0)>
5.7 - <h5>${bundle.GAME_MOVE}</h5>
5.8 + <h5>${bundle("GAME_MOVE", toMove?int)}</h5>
5.9
5.10 <ol>
5.11 <#assign printed = 0/>
5.12 @@ -86,7 +86,7 @@
5.13 </#if>
5.14
5.15 <#if (toWait > 0)>
5.16 - <h5>${bundle.GAME_WAIT}</h5>
5.17 + <h5>${bundle("GAME_WAIT", toWait?int)}</h5>
5.18 <ol>
5.19 <#assign printed = 0/>
5.20 <#list doc.gameIds.* as g>
5.21 @@ -103,7 +103,7 @@
5.22 </#if>
5.23
5.24 <#if (toWon > 0)><!-- ${toWon} -->
5.25 - <h5>${bundle.GAME_WON}</h5>
5.26 + <h5>${bundle("GAME_WON", toWon?int)}</h5>
5.27
5.28 <ol>
5.29 <#assign printed = 0/>
5.30 @@ -122,7 +122,7 @@
5.31 </#if>
5.32
5.33 <#if (toLost > 0)>
5.34 - <h5>${bundle.GAME_LOST}</h5>
5.35 + <h5>${bundle("GAME_LOST", toLost?int)}</h5>
5.36
5.37 <ol>
5.38 <#assign printed = 0/>