[Rails-commits] 2 commits - LocalisedText.properties rails/common tiles/Create_TileDictionary_pdf.sh

[Stefan F. <ste...@us...>]

 LocalisedText.properties            |    1 +
 rails/common/parser/GameOption.java |    3 ++-
 tiles/Create_TileDictionary_pdf.sh  |    4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 6e25c4b3ca3ecb705741cf7877181b3830e9fc11
Author: Stefan Frey <ste...@we...>
Date:   Thu Aug 25 07:50:35 2011 +0200

    Patch from "Adam Badura" <ab...@o2...>:
    
    (1) There is a localized string missing for 1830 option.
    
    (2) There was bug in game options parsing from XML. Non-parametrized
    names did not initialized the name that they then returned resulting in
    options being overwritten in maps as they have had all “null” name.

diff --git a/LocalisedText.properties b/LocalisedText.properties
index b0750ce..a0dad56 100644
--- a/LocalisedText.properties
+++ b/LocalisedText.properties
@@ -61,6 +61,7 @@ BuysRight={0} buys the ''{1}'' right for {2}
 BuysTrain={0} buys a {1}-train from {2} for {3}.
 BuysTrainUsingSP={0} buys a {1}-train from {2} for {3} using {4}.
 BYFloatsAt=Bayern floats at
+C&ACertificate(ReadingOnly)=C&A Certificate (Reading variant only)
 CASH=Cash
 CANCEL=Cancel
 CanOperate={0} can operate this round
diff --git a/rails/common/parser/GameOption.java b/rails/common/parser/GameOption.java
index 009f9e0..aa893df 100644
--- a/rails/common/parser/GameOption.java
+++ b/rails/common/parser/GameOption.java
@@ -32,7 +32,8 @@ public class GameOption {
     private static final Pattern pattern = Pattern.compile("\\{(.*)\\}");
 
     public GameOption(String name) {
-    	this.name = name;
+        this.name = name;
+        parametrisedName = constructParametrisedName (name, null);
     }
     
     public GameOption(String name, String[] parameters) {


commit d389ae0a8372a86e59a697e9dcb6089397a09f1d
Author: Stefan Frey <ste...@we...>
Date:   Wed Aug 24 07:15:47 2011 +0200

    Updated paths for tools inside shell script

diff --git a/tiles/Create_TileDictionary_pdf.sh b/tiles/Create_TileDictionary_pdf.sh
index de3c719..0c521fa 100755
--- a/tiles/Create_TileDictionary_pdf.sh
+++ b/tiles/Create_TileDictionary_pdf.sh
@@ -1,13 +1,13 @@
 # !/bin/bash
 # author Stefan Frey
-# requires installed tools: java, batik library, mmv and imagemagick (montage command)
+# requires installed tools: mmv and imagemagick (montage command)
 # use whereis to retrieve path information
 
 # creates temporary directory
 mkdir svg_catalog_tmp
 
 # convert svg to png
-java -jar /usr/share/batik/batik-rasterizer.jar -d svg_catalog_tmp/ -w 400 -h 400 -dpi 400 -m image/png svg/ 
+java -jar ../lib/batik-1.7/batik-rasterizer.jar -d svg_catalog_tmp/ -w 400 -h 400 -dpi 400 -m image/png svg/ 
 
 # rename to have all filenames in -xxxxx.png notation
 /usr/bin/mmv 'svg_catalog_tmp/tile0.png' 'svg_catalog_tmp/m00000.png'