# HG changeset patch # User Jaroslav Tulach # Date 1258619729 -3600 # Node ID 07e3bcb65c1d303df62fc4689ff31274fb4d8592 # Parent b9e67a17bd1014a13762a1bd945e4dafc912c4e4 Showing the number of won and lost games diff -r b9e67a17bd10 -r 07e3bcb65c1d freemarkerdor/pom.xml --- a/freemarkerdor/pom.xml Thu Nov 19 09:25:45 2009 +0100 +++ b/freemarkerdor/pom.xml Thu Nov 19 09:35:29 2009 +0100 @@ -10,7 +10,7 @@ org.apidesign freemarkerdor freemarkerdor - 1.40 + 1.41 http://maven.apache.org diff -r b9e67a17bd10 -r 07e3bcb65c1d freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java --- a/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java Thu Nov 19 09:25:45 2009 +0100 +++ b/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java Thu Nov 19 09:35:29 2009 +0100 @@ -29,7 +29,6 @@ import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.UniformInterfaceException; import com.sun.jersey.api.client.WebResource; -import com.sun.jersey.api.client.config.DefaultClientConfig; import com.sun.jersey.api.container.httpserver.HttpServerFactory; import com.sun.jersey.api.core.PackagesResourceConfig; import com.sun.jersey.api.core.ResourceConfig; diff -r b9e67a17bd10 -r 07e3bcb65c1d freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/Bundle.properties --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/Bundle.properties Thu Nov 19 09:25:45 2009 +0100 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/Bundle.properties Thu Nov 19 09:35:29 2009 +0100 @@ -18,8 +18,8 @@ } ago GAME_MOVE=Your move GAME_WAIT=Opponent's move -GAME_WON=Won games -GAME_LOST=Lost games +GAME_WON=Won games ({0}) +GAME_LOST=Lost games ({0}) CREATE=Create! GAME_ALL=All games WHITE=White diff -r b9e67a17bd10 -r 07e3bcb65c1d freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/Bundle_cs.properties --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/Bundle_cs.properties Thu Nov 19 09:25:45 2009 +0100 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/Bundle_cs.properties Thu Nov 19 09:35:29 2009 +0100 @@ -8,8 +8,8 @@ gameWhiteBlack={0} proti {1} GAME_MOVE=Na tahu GAME_WAIT=\u010Cek\u00E1 se na tah -GAME_WON=Vyhran\u00E9 -GAME_LOST=Prohran\u00E9 +GAME_WON=Vyhran\u00E9 ({0}) +GAME_LOST=Prohran\u00E9 ({0}) CREATE=Vytvo\u0159 novou GAME_ALL=V\u0161echny hry WHITE=B\u00EDl\u00FD diff -r b9e67a17bd10 -r 07e3bcb65c1d freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Thu Nov 19 09:25:45 2009 +0100 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Thu Nov 19 09:35:29 2009 +0100 @@ -68,7 +68,7 @@ <#if (toMove > 0)> -
${bundle.GAME_MOVE}
+
${bundle("GAME_MOVE", toMove?int)}
    <#assign printed = 0/> @@ -86,7 +86,7 @@ <#if (toWait > 0)> -
    ${bundle.GAME_WAIT}
    +
    ${bundle("GAME_WAIT", toWait?int)}
      <#assign printed = 0/> <#list doc.gameIds.* as g> @@ -103,7 +103,7 @@ <#if (toWon > 0)> -
      ${bundle.GAME_WON}
      +
      ${bundle("GAME_WON", toWon?int)}
        <#assign printed = 0/> @@ -122,7 +122,7 @@ <#if (toLost > 0)> -
        ${bundle.GAME_LOST}
        +
        ${bundle("GAME_LOST", toLost?int)}
          <#assign printed = 0/>