Changeset 28252 in osm for applications/editors/josm

Timestamp:

2012-04-12T13:42:54+02:00 (12 years ago)

Author:

simon04

Message:

JOSM/i18n: correct number of newlines in convpreset, test for existing URL in convwms

Location:

applications/editors/josm/i18n

Files:

• convpreset.pl (modified) (1 diff)
• convwms.pl (modified) (1 diff)

applications/editors/josm/i18n/convpreset.pl

@@ -142 +142 @@
     {
       my $val = fix($1);
-      print "/* item $item $combo_type $combo_n entry $value display value */" . ($vctxi ? " trc($vctxi, $val);" : " tr($val);") . "\n";
+      print "/* item $item $combo_type $combo_n entry $value display value */" . ($vctxi ? " trc($vctxi, $val);" : " tr($val);");
     }
     else
     {
       my $val = fix($value);
-      print "/* item $item $combo_type $combo_n entry $value display value */" . ($vctxi ? " trc($vctxi, $val);" : " tr($val);") . "\n";
+      print "/* item $item $combo_type $combo_n entry $value display value */" . ($vctxi ? " trc($vctxi, $val);" : " tr($val);");
     }
     if($line =~ /short_description=(".*?")/)
     {
       my $val = fix($1);
-      print "/* item $item $combo_type $combo_n entry $value short description */ tr($val);\n";
-    }
+      print "/* item $item $combo_type $combo_n entry $value short description */ tr($val);";
+    }
+    print "\n";
   }
   elsif($line =~ /<\/group>/)

applications/editors/josm/i18n/convwms.pl

@@ -21 +21 @@
 if($ARGV[0] && $ARGV[0] =~ /^http:\/\//)
 {
-  @lines = split("\r?\n", get($ARGV[0]));
+  my $content = get($ARGV[0]);
+  die "Couldn't get $ARGV[0]" unless defined $content;
+  @lines = split("\r?\n", $content);
 }
 else