[Koha-cvs] CVS: koha/misc/translator text-extract2.pl,1.30,1.31

[Ambrose Li]

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7307

Modified Files:
	text-extract2.pl 
Log Message:
Fix spurious warnings if attribute is in the form foo="bar"</TMPL_IF>


Index: text-extract2.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** text-extract2.pl	14 Feb 2004 09:33:09 -0000	1.30
--- text-extract2.pl	14 Feb 2004 09:41:28 -0000	1.31
***************
*** 108,111 ****
--- 108,112 ----
  		. (defined $lc? " near line $lc": '') . ": $val_orig\n";
  	} elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) {
+ 	    # FIXME: we probably should not warn if key is "onclick" etc? :-/
  	    my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/? 'URL': 'HTML');
  	    warn_pedantic \$pedantic_tmpl_var_use_in_nonpedantic_mode_p,
***************
*** 114,121 ****
  		if $pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p;
  	} elsif ($val_orig !~ /^['"]/) {
  	    warn_pedantic \$pedantic_attribute_error_in_nonpedantic_mode_p,
  		"Unquoted attribute contains character(s) that should be quoted"
  		. (defined $lc? " near line $lc": '') . ": $val_orig"
! 		if $val =~ /[^-\.A-Za-z0-9]/s;
  	}
      }
--- 115,123 ----
  		if $pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p;
  	} elsif ($val_orig !~ /^['"]/) {
+ 	    my $t = $val; $t =~ s/$re_directive_control//os;
  	    warn_pedantic \$pedantic_attribute_error_in_nonpedantic_mode_p,
  		"Unquoted attribute contains character(s) that should be quoted"
  		. (defined $lc? " near line $lc": '') . ": $val_orig"
! 		if $t =~ /[^-\.A-Za-z0-9]/s;
  	}
      }