Changeset 29999 in osm for applications/editors

Timestamp:

2013-10-06T14:29:23+02:00 (11 years ago)

Author:

donvip

Message:

[josm_i18n] fix #josm9112 - fix #josm9156 - i18n patches by AlfonZ

Location:

applications/editors/josm/i18n

Files:

• convpreset.pl (modified) (1 diff)
• convstyle.pl (modified) (2 diffs)

applications/editors/josm/i18n/convpreset.pl

@@ -184 +184 @@
   {
     $combo_n = "";
+    print "\n";
   }
   elsif(!$line)

applications/editors/josm/i18n/convstyle.pl

@@ -5 +5 @@
 
 use strict;
+
+my $rule_cond; # cumulated conditions from current rule
 
 # This is a simple conversion and in no way a complete XML parser
@@ -21 +23 @@
     print "/* mappaint style named $1 */ tr($1);\n";
   }
+  elsif($line =~ /<rule\s*>/)
+  {
+    $rule_cond = "";
+    print "/* $line */\n";
+  }
+  elsif($line =~ /<condition.*\s+k="([^"]*)"/)
+  {
+    my $cond_k = $1; # according to schema, k is always present
+    my $cond_v = ($line =~ /\s+v="([^"]*)"/) ? $1 : "";
+    my $cond_b = ($line =~ /\s+b="([^"]*)"/) ? $1 : "";
+    print STDERR "$0: Found both v=\"$cond_v\" and b=\"$cond_b\" for k=\"$cond_k\" at line $.\n" if ($cond_v && $cond_b);
+    my $cond = ($cond_v || $cond_b) ? "$cond_k=$cond_v$cond_b" : "$cond_k"; # v and b shouldn't appear both
+    if ($rule_cond)
+    {
+      $rule_cond .= ", " . $cond;
+    }
+    else
+    {
+      $rule_cond = $cond;
+    }
+    print "/* $line */\n";
+  }
   elsif($line =~ /colour="([^"]+)#/)
   {
-    my $c = $1;
-    my $co = $1;
-    $c =~ s/[^a-z0-9]+/./g;
-    print "/* color $co */ tr(\"$c\");\n";
+    if ($line =~ /\s+colour="([^"]+)#/)
+    {
+      my $c = $1;
+      my $co = $1;
+      $c =~ s/[^a-z0-9]+/./g;
+      print "/* color $co (applied for \"$rule_cond\") */ tr(\"$c\");";
+    }
+    if ($line =~ /\s+dashedcolour="([^"]+)#/)
+    {
+      my $c = $1;
+      my $co = $1;
+      $c =~ s/[^a-z0-9]+/./g;
+      print "/* color $co (applied for \"$rule_cond\") */ tr(\"$c\");";
+    }
+    print "\n";
   }
   else