[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/scripts
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2012-09-24 12:31:18
Message-ID: 20120924123118.F17C1AC7E9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1317578 by aacid:

Add a warning if a line in a file passed to extractrc contains more than one tag to \
patch since it does not work


 M  +8 -0      extractrc  


--- trunk/KDE/kdesdk/scripts/extractrc #1317577:1317578
@@ -213,6 +213,7 @@
   }
 
   my $string          = "";
+  my $origstring      = "";
   my $in_text         = 0;
   my $start_line_no   = 0;
   my $in_skipped_prop = 0;
@@ -239,6 +240,7 @@
      chomp;
 
      $string .= "\n" . $_;
+     $origstring = $string;
      
      # 'database', 'associations', 'populationText' and 'styleSheet' properties \
contain strings that shouldn't be translated  
@@ -299,7 +301,13 @@
          my ($attr_notr) = $attr =~ /\bnotr=\"([^\"]*)\"/ if $attr;
          $notr = $attr_notr if $attr_notr;
 
+         my $nongreedystring = $string;
          $string        =~ s/^.*<$text_string//so;
+         $nongreedystring  =~ s/^.*?<$text_string//so;
+         if ($string cmp $nongreedystring)
+         {
+            print STDERR "Warning: Line $origstring in file $file_name has more than \
one tag to extract on the same line, that is not supported by extractrc\n"; +         \
}  if ( not $attr or $attr !~ /\/ *$/ )
          {
            $in_text       =  1;


[prev in list] [next in list] [prev in thread] [next in thread]