# HG changeset patch # User Jaroslav Tulach # Date 1252354579 -7200 # Node ID 90de58894949bae41ff483e18ef4623a794dcb65 # Parent 33cf89760fabf7fa2fb828a995830cd6933fac1a Using bundle("key", args) to get better order of localization diff -r 33cf89760fab -r 90de58894949 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt Mon Sep 07 17:43:43 2009 +0200 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt Mon Sep 07 22:16:19 2009 +0200 @@ -9,7 +9,7 @@

${bundle.GAME}

${doc.game.id.@white}${bundle.VS}${doc.game.id.@black}

${bundle("players", doc.game.id.@white?string, doc.game.id.@black?string)}

${bundle.RELOAD} @@ -25,13 +25,13 @@ <#assign play = false> <#if doc.game.id.@result = "IN_PROGRESS" > - ${bundle.MOVE_WHO} ${doc.game.@currentPlayer} + ${bundle("MOVE_WHO", doc.game.@currentPlayer?string)} <#assign play = user = doc.game.@currentPlayer> <#else> <#if doc.game.id.@result = "WHITE_WON"> - ${doc.game.id.@white} ${bundle.WON} + ${bundle("WON", doc.game.id.@white?string)} <#else> - ${doc.game.id.@black} ${bundle.WON} + ${bundle("WON", doc.game.id.@black?string)} <#if play> diff -r 33cf89760fab -r 90de58894949 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.properties --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.properties Mon Sep 07 17:43:43 2009 +0200 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.properties Mon Sep 07 22:16:19 2009 +0200 @@ -1,4 +1,4 @@ -VS= vs. +players={0} vs. {1} PLACE=Place! MOVE=Move! H=Horizontal @@ -8,5 +8,5 @@ MOVENUMBER=# MOVES=Moves ROOT=Home -MOVE_WHO=Who's turn -WON=won +MOVE_WHO=It is {0}'s turn. +WON={0} won diff -r 33cf89760fab -r 90de58894949 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game_cs.properties --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game_cs.properties Mon Sep 07 17:43:43 2009 +0200 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game_cs.properties Mon Sep 07 22:16:19 2009 +0200 @@ -1,4 +1,4 @@ -VS=/ +players={0} proti {1} PLACE=Um\u00EDstit MOVE=T\u00E1hnout H=Horizont\u00E1ln\u011B @@ -8,5 +8,5 @@ MOVENUMBER=Tah MOVES=Z\u00E1pis ROOT=Dom\u016F -MOVE_WHO=Na tahu je -WON=vyhr\u00E1l +MOVE_WHO=Na tahu je {0} +WON=Vyhr\u00E1l {0} diff -r 33cf89760fab -r 90de58894949 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Mon Sep 07 17:43:43 2009 +0200 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Mon Sep 07 22:16:19 2009 +0200 @@ -8,7 +8,7 @@

${bundle.TITLE}

<#macro game game> - ${game.@white}${bundle.VS}${game.@black} board + ${bundle("gameWhiteBlack", game.@white?string, game.@black?string)} ${bundle.BOARD} <#if message?? > diff -r 33cf89760fab -r 90de58894949 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.properties --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.properties Mon Sep 07 17:43:43 2009 +0200 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.properties Mon Sep 07 22:16:19 2009 +0200 @@ -1,5 +1,6 @@ TITLE=Quoridor Community Server -VS= vs. +gameWhiteBlack={0} vs. {1} +BOARD=QuoBoard GAME_MOVE=Games where you are expected to move GAME_WON=Won games GAME_LOST=Lost Games diff -r 33cf89760fab -r 90de58894949 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index_cs.properties --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index_cs.properties Mon Sep 07 17:43:43 2009 +0200 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index_cs.properties Mon Sep 07 22:16:19 2009 +0200 @@ -1,5 +1,6 @@ TITLE=Komunitn\u00ED server Quoridor -VS=/ +gameWhiteBlack={0} proti {1} +BOARD=Quoridornice GAME_MOVE=Jsi na tahu... GAME_WON=Vyhran\u00E9 GAME_LOST=Prohran\u00E9