[Koha-cvs] CVS: koha/misc/translator opac-css.fr,1.1.2.1,1.1.2.2 tmpl_process.pl,1.5.2.1,1.5.2.2

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_0
        opac-css.fr tmpl_process.pl 
Log Message:
minor improvement to manage better ()\{... in strings

Index: opac-css.fr
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/Attic/opac-css.fr,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-css.fr 8 Jan 2004 15:59:37 -0000       1.1.2.1
--- opac-css.fr 12 Jan 2004 09:58:23 -0000      1.1.2.2
***************
*** 3,7 ****
  Additional Author     Autres auteurs
  Advanced search       Recherche avancée
! Advanced Search, More Options Recherche avancée
  Amount        Quantité
  An Error has Occurred Une erreur s'est produite
--- 3,7 ----
  Additional Author     Autres auteurs
  Advanced search       Recherche avancée
! Advanced Search, More Options Recherche avancée, plus d'options
  Amount        Quantité
  An Error has Occurred Une erreur s'est produite

Index: tmpl_process.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** tmpl_process.pl     8 Jan 2004 15:59:11 -0000       1.5.2.1
--- tmpl_process.pl     12 Jan 2004 09:58:23 -0000      1.5.2.2
***************
*** 175,180 ****
                        foreach my $text (sort  {uc($b) cmp uc($a) || 
length($b) <=> length($a)} keys %{$strhash})
                        {
! #                     $text =~ s/\'/\\\'/g;
! #                     $text =~ s/\./\\\./g;
                                # Test if the key has been translated
                                if( %{$strhash}->{$text} != 1 )
--- 175,193 ----
                        foreach my $text (sort  {uc($b) cmp uc($a) || 
length($b) <=> length($a)} keys %{$strhash})
                        {
!                       # escaping \|()[{}^$*+?.
!                       $text =~ s/\\/\\\\/g;
!                       $text =~ s/\|/\\\|/g;
!                       $text =~ s/\(/\\\(/g;
!                       $text =~ s/\)/\\\)/g;
!                       $text =~ s/\[/\\\[/g;
!                       $text =~ s/\]/\\\]/g;
!                       $text =~ s/\{/\\\{/g;
!                       $text =~ s/\}/\\\}/g;
!                       $text =~ s/\^/\\\^/g;
!                       $text =~ s/\$/\\\$/g;
!                       $text =~ s/\*/\\\*/g;
!                       $text =~ s/\+/\\\+/g;
!                       $text =~ s/\?/\\\?/g;
!                       $text =~ s/\?/\\\?/g;
                                # Test if the key has been translated
                                if( %{$strhash}->{$text} != 1 )