[Koha-cvs] CVS: koha/misc/translator text-extract.pl,1.1,1.2 tmpl_process.pl,1.1,1.2

[Paul POULAIN]

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1:/tmp/cvs-serv31383/misc/translator

Modified Files:
	text-extract.pl tmpl_process.pl 
Log Message:
improving what's discarded : script & stylesheet

Index: text-extract.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/text-extract.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** text-extract.pl	5 Dec 2003 16:53:46 -0000	1.1
--- text-extract.pl	8 Dec 2003 13:03:28 -0000	1.2
***************
*** 10,16 ****
  		foreach my $c ($x->content_list) {
  			next if (ref($c) && $c->tag() eq "~comment");
! 			print "$c\n" unless ref($c);
  			if (ref($c) && $c->attr('alt')) {
  				print $c->attr('alt')."\n";
  			}
  			if (ref($c) && $c->tag() eq 'meta') {
--- 10,26 ----
  		foreach my $c ($x->content_list) {
  			next if (ref($c) && $c->tag() eq "~comment");
! 			next if (ref($c) && $c->tag() eq "script");
! 			next if (ref($c) && $c->tag() eq "style");
! 			if (!ref($c)) {
! 				print "$c\n";
! 			}
  			if (ref($c) && $c->attr('alt')) {
  				print $c->attr('alt')."\n";
+ 			}
+ 			if (ref($c) && $c->attr('title')) {
+ 				print $c->attr('title')."\n";
+ 			}
+ 			if (ref($c) && $c->tag() eq "input" && $c->attr('value')) {
+ 				print $c->attr('value')."\n";
  			}
  			if (ref($c) && $c->tag() eq 'meta') {

Index: tmpl_process.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** tmpl_process.pl	5 Dec 2003 16:53:46 -0000	1.1
--- tmpl_process.pl	8 Dec 2003 13:03:28 -0000	1.2
***************
*** 234,238 ****
  					{
  						# the line is not already in the list so add it
! 						%{$strhash}->{$str} = 1;
  					}
  				}
--- 234,238 ----
  					{
  						# the line is not already in the list so add it
! 						%{$strhash}->{$str}=1;
  					}
  				}
***************
*** 263,269 ****
  	{
  		chomp $line;
! 		
  		# extracts the two fields
! 		my ($original, $translated) = split(/$split_char/, $line, 2);
  
  		if($translated ne "")
--- 263,269 ----
  	{
  		chomp $line;
! 
  		# extracts the two fields
! 		my ($original, $translated,$nb) = split(/$split_char/, $line, 3);
  
  		if($translated ne "")
***************
*** 277,285 ****
  			%{$strhash}->{$original} = 1;
  		}
! 		
  	}
! 	
  	close($fh);
! 	
  	return %{$strhash};
  }
--- 277,285 ----
  			%{$strhash}->{$original} = 1;
  		}
! 
  	}
! 
  	close($fh);
! 
  	return %{$strhash};
  }