Changeset 26344 in osm

Timestamp:

2011-07-16T18:28:37+02:00 (13 years ago)

Author:

stoecker

Message:

improve checks

File:

• applications/editors/josm/i18n/i18n.pl (modified) (2 diffs)

applications/editors/josm/i18n/i18n.pl

@@ -213 +213 @@
   my $v = $tr;
   $v =~ s/''//g; # replace all twice occuring single quotes
+  $v =~ s/'[{}]'//g; # replace all bracketquoting single quotes
   if($v =~ /'/)#&& $la ne "en")
   {
@@ -223 +224 @@
   my $fmte;
   my $fmte1 = "";
-  while($tr =~ /\{(.*?)\}/g) {push @fmt,$1}; $fmt = join("_", sort @fmt); @fmt = ();
-  while($en =~ /\{(.*?)\}/g) {push @fmt,$1}; $fmte = join("_", sort @fmt); @fmt = ();
-  if($en1) {while($en1 =~ /\{(.*?)\}/g) {push @fmt,$1}; $fmte1 = join("_", sort @fmt);}
+  my $trt = $tr; $trt =~ s/'[{}]'//g;
+  while($trt =~ /\{(.*?)\}/g) {push @fmt,$1}; $fmt = join("_", sort @fmt); @fmt = ();
+  my $ent = $en; $ent =~ s/'[{}]'//g;
+  while($ent =~ /\{(.*?)\}/g) {push @fmt,$1}; $fmte = join("_", sort @fmt); @fmt = ();
+  if($en1)
+  {
+     my $en1t = $en1; $en1t =~ s/'[{}]'//g;
+     while($en1t =~ /\{(.*?)\}/g) {push @fmt,$1}; $fmte1 = join("_", sort @fmt);
+  }
   if($fmt ne $fmte && $fmt ne $fmte1)
   {