Changeset 34996 in osm for applications

Timestamp:

2019-05-04T22:39:59+02:00 (6 years ago)

Author:

stoecker

Message:

fix #josm17679 - CDATA in translated texts

Location:

applications/editors/josm/i18n

Files:

• convmaps.pl (modified) (1 diff)
• i18n.pl (modified) (1 diff)

applications/editors/josm/i18n/convmaps.pl

@@ -42 +42 @@
     print "tr(\"$val\"); /* $line */\n";
   }
+  elsif($line =~ /<description +lang=['"]en['"]><!\[CDATA\[(.*)\]\]><\/description>/)
+  {
+    my $val = $1;
+    $val =~ s/"/\\"/g;
+    print "tr(\"$val\"); /* $line */\n";
+  }
   elsif($line =~ /<description +lang=['"]en['"]>(.*)<\/description>/)
   {

applications/editors/josm/i18n/i18n.pl

@@ -270 +270 @@
   {
     warn "JAVA translation issue for language $la: Mismatching single quotes:\nTranslated text: ".decode("utf8",$tr)."\nOriginal text: ".decode("utf8",$en)."\n";
+    $error = 1;
+  }
+  if($tr =~ /<!\[CDATA\[/)#&& $la ne "en")
+  {
+    warn "JAVA translation issue for language $la: CDATA in string:\nTranslated text: ".decode("utf8",$tr)."\nOriginal text: ".decode("utf8",$en)."\n";
     $error = 1;
   }