This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 1494471345 Removed whitespace
1494471345 is described below

commit 1494471345c116e334a0724b84679d456e4f1465
Author: mseidel <[email protected]>
AuthorDate: Mon Sep 5 15:53:14 2022 +0200

    Removed whitespace
---
 main/l10ntools/scripts/localize.pl | 343 ++++++++++++++++++-------------------
 1 file changed, 171 insertions(+), 172 deletions(-)

diff --git a/main/l10ntools/scripts/localize.pl 
b/main/l10ntools/scripts/localize.pl
index f545e05d1e..20bc4591c4 100755
--- a/main/l10ntools/scripts/localize.pl
+++ b/main/l10ntools/scripts/localize.pl
@@ -2,9 +2,9 @@
 eval 'exec perl -wS $0 ${1+"$@"}'
     if 0;
 
-    
+
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -12,20 +12,20 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 
-   
+
 use strict;
 use Getopt::Long;
 use IO::Handle;
@@ -39,11 +39,11 @@ use Cwd;
 my $CVS_BINARY = "/usr/bin/cvs";
 # ver 1.1
 #
-#### module lookup 
+#### module lookup
 #use lib ("$ENV{SOLARENV}/bin/modules", "$ENV{COMMON_ENV_TOOLS}/modules");
 
 #### module lookup
-# OOo conform
+# AOO conform
 my @lib_dirs;
 BEGIN {
     if ( !defined($ENV{SOLARENV}) ) {
@@ -73,7 +73,7 @@ my $force_ooo_module = '0';
 my %is_ooo_module;
 my %is_so_module;
 
-         #         (                           leftpart                        
                             )            (           rightpart                 
   )    
+         #         (                           leftpart                        
                             )            (           rightpart                 
   )
          #            prj      file      dummy     type       gid       lid    
  helpid    pform     width      lang       text    helptext  qhelptext   title 
   timestamp
 my $sdf_regex  = 
"((([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*))\t([^\t]*)\t(([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t)([^\t]*))";
 my $file_types = "(src|hrc|xcs|xcu|lng|ulf|xrm|xhp|xcd|xgf|xxl|xrb)";
@@ -97,20 +97,20 @@ else
 #%sl_modules = fetch_sourcelanguage_dirlist();
 
 
-if   ( $mode eq "merge"    )    {   
+if   ( $mode eq "merge"    )    {
     if ( ! $no_gsicheck ){
         merge_gsicheck();
     }
-    splitfile( $sdffile );      
+    splitfile( $sdffile );
     if ( ! $no_gsicheck ){
         unlink $sdffile;             # remove temp file!
     }
 }
-elsif( $mode eq "extract"  )    {   
+elsif( $mode eq "extract"  )    {
     collectfiles( $outputfile );
 }
-else                            {  
-    usage();                    
+else                            {
+    usage();
 }
 
 exit(0);
@@ -133,13 +133,13 @@ sub splitfile{
     #print STDOUT "Open File $sdffile\n";
     open MYFILE , "< $sdffile"
     or die "Can't open '$sdffile'\n";
-    
+
 #    my %lang_hash;
     my %string_hash_ooo;
     my %string_hash_so;
     my %so_modules;
     $so_modules{ "extras_full" } = "TRUE";
-    
+
     while( <MYFILE>){
          if( /$sdf_regex/ ){
             my $line           = defined $_ ? $_ : '';
@@ -150,17 +150,17 @@ sub splitfile{
             my $lid            = defined $8 ? $8 : '';
             my $lang           = defined $12 ? $12 : '';
             my $platform       = defined $10 ? $10 : '';
-            my $helpid         = defined $9 ? $9 : ''; 
+            my $helpid         = defined $9 ? $9 : '';
             next if( $prj eq "binfilter" );     # Don't merge strings into 
binfilter module
                chomp( $line );
-           
+
             if( $force_ooo_module )
             {
-                $string_hash_ooo { $lang }{ 
"$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$platform\t$lang" } = $line; 
+                $string_hash_ooo { $lang }{ 
"$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$platform\t$lang" } = $line;
             }
             else
             {
-                $string_hash_so{ $lang }{ 
"$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$platform\t$lang" } = $line; 
+                $string_hash_so{ $lang }{ 
"$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$platform\t$lang" } = $line;
             }
         }
     }
@@ -177,7 +177,7 @@ sub splitfile{
 
     #print "$so_l10n_path\n";
     #print "$ooo_l10n_path\n";
-    
+
     if( $force_ooo_module )
     {
         write_sdf( \%string_hash_ooo , $ooo_l10n_path );
@@ -185,19 +185,19 @@ sub splitfile{
     else
     {
         write_sdf( \%string_hash_so , $so_l10n_path );
-    } 
+    }
 }
 
 sub write_sdf
 {
     my $string_hash         = shift;
-    my $l10n_file           = shift; 
-    
+    my $l10n_file           = shift;
+
     foreach my $lang( keys( %{ $string_hash } ) )
     {
         my @sdf_file;
-        next , if( $lang eq "en-US" ); 
-        
+        next , if( $lang eq "en-US" );
+
         mkdir $l10n_file."/$lang";
         # mkdir!!!!
         my $current_l10n_file = $l10n_file."/$lang/localize.sdf";
@@ -213,10 +213,10 @@ sub write_sdf
                     my $gid            = defined $7 ? $7 : '';
                     my $lid            = defined $8 ? $8 : '';
                     my $lang           = defined $12 ? $12 : '';
-                    my $platform       = defined $10 ? $10 : ''; 
+                    my $platform       = defined $10 ? $10 : '';
                     my $helpid         = defined $9 ? $9 : '';
-            
-                    chomp( $line );    
+
+                    chomp( $line );
                     if ( defined $string_hash->{ $lang }{ 
"$prj\t$file\t$type\t$gid\t$lid\t$helpid\t$platform\t$lang" } )
                     {
                         # Changed String!
@@ -232,14 +232,14 @@ sub write_sdf
             }
         }
         close( DESTFILE );
-        #Now just append the enw strings
-        #FIXME!!! Implement insertion in the correct order 
+        #Now just append the new strings
+        #FIXME!!! Implement insertion in the correct order
         foreach my $key ( keys ( %{ $string_hash->{ $lang } } ) )
         {
             push @sdf_file , $string_hash->{ $lang }{ $key } , if ( defined 
$string_hash->{ $lang }{ $key } );
             #print "WARNING: Not defined = ".$string_hash->{ $lang }{ $key 
}."\n", if( ! defined  $string_hash->{ $lang }{ $key } );
         }
-        
+
         # Write the new file
         my ( $TMPFILE , $tmpfile ) = File::Temp::tempfile();
         if( open DESTFILE , "+> $tmpfile " ){
@@ -249,12 +249,12 @@ sub write_sdf
             }
             close ( DESTFILE );
             if( move( $current_l10n_file , $current_l10n_file.".backup" ) ){
-                if( copy( $tmpfile , $current_l10n_file ) ){ 
-                    unlink $l10n_file.".backup";  
+                if( copy( $tmpfile , $current_l10n_file ) ){
+                    unlink $l10n_file.".backup";
                  } else { print STDERR "Can't open/create '$l10n_file', 
original file is renamed to $l10n_file.backup\n"; }
             } else { print STDERR "Can't open/create '$l10n_file'\n"; }
          }else{
-            print STDERR "WARNING: Can't open/create '$l10n_file'\n";  
+            print STDERR "WARNING: Can't open/create '$l10n_file'\n";
          }
          unlink $tmpfile;
      }
@@ -263,18 +263,18 @@ sub write_sdf
 #########################################################
 
 sub get_license_header{
-    return 
+    return
 "#\n".
-"#    ####    ###     #   #   ###   #####    #####  ####   #####  #####  \n".
-"#    #   #  #   #    ##  #  #   #    #      #      #   #    #      #    \n".
-"#    #   #  #   #    # # #  #   #    #      ###    #   #    #      #    \n".
-"#    #   #  #   #    #  ##  #   #    #      #      #   #    #      #    \n".
-"#    ####    ###     #   #   ###     #      #####  ####   #####    #    \n".
+"#    ####    ###     #   #   ###   #####    #####  ####   #####  #####\n".
+"#    #   #  #   #    ##  #  #   #    #      #      #   #    #      #\n".
+"#    #   #  #   #    # # #  #   #    #      ###    #   #    #      #\n".
+"#    #   #  #   #    #  ##  #   #    #      #      #   #    #      #\n".
+"#    ####    ###     #   #   ###     #      #####  ####   #####    #\n".
 "#\n".
 "#    DO NOT EDIT! This file will be overwritten by localization process\n".
 "#\n".
 "#**************************************************************\n".
-"#  \n".
+"#\n".
 "#  Licensed to the Apache Software Foundation (ASF) under one\n".
 "#  or more contributor license agreements.  See the NOTICE file\n".
 "#  distributed with this work for additional information\n".
@@ -282,16 +282,16 @@ sub get_license_header{
 "#  to you under the Apache License, Version 2.0 (the\n".
 "#  \"License\"); you may not use this file except in compliance\n".
 "#  with the License.  You may obtain a copy of the License at\n".
-"#  \n".
+"#\n".
 "#    http://www.apache.org/licenses/LICENSE-2.0\n";.
-"#  \n".
+"#\n".
 "#  Unless required by applicable law or agreed to in writing,\n".
 "#  software distributed under the License is distributed on an\n".
 "#  \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n".
 "#  KIND, either express or implied.  See the License for the\n".
 "#  specific language governing permissions and limitations\n".
 "#  under the License.\n".
-"#  \n".
+"#\n".
 "#**************************************************************\n";
 }
 ######## Check input sdf file and use only the correct part
@@ -299,7 +299,7 @@ sub merge_gsicheck{
     my $command = '';
     my ( $TMPHANDLE , $tmpfile ) = File::Temp::tempfile();
     close ( $TMPHANDLE );
-    
+
     $command = "$ENV{WRAPCMD} " if( $ENV{WRAPCMD} );
     $command .= "$ENV{SOLARVER}/$ENV{INPATH}/bin/gsicheck";
 
@@ -313,7 +313,7 @@ sub merge_gsicheck{
         print STDOUT "### The file $errfile have been written containing the 
errors in your sdf file. Those lines will not be merged: ###\n\n";
         print STDOUT "$output\n";
         print STDOUT "################\n";
-       
+
     }else{
         # Remove the 0 Byte file
         unlink $errfile;
@@ -323,10 +323,10 @@ sub merge_gsicheck{
 #########################################################
 # find search function
 sub wanted
-{ 
+{
     my $file = $File::Find::name;
     if( -f $file && $file =~ /.*localize.sdf$/ && !( $file =~ /.*\.svn.*/ ) ) {
-        push   @sdfparticles , $file; 
+        push   @sdfparticles , $file;
         if( $bVerbose eq "1" ) { print STDOUT "$file\n"; }
         else { print ".";  }
     }
@@ -347,18 +347,18 @@ sub add_paths
             {
                 push @sdfparticles , "$ooo_l10n_dir/$lang/localize.sdf";
             }
-            else { print "WARNING: $loc_file not found ....\n"; }
+            else { print "WARNING: $loc_file not found...\n"; }
         }
     }
-    else { die "ERROR: Can not find directory $ooo_l10n_dir!!!" }
+    else { die "ERROR: Can not find directory $ooo_l10n_dir!" }
 }
 sub collectfiles{
-    print STDOUT "### Localize\n"; 
-    my $localizehash_ref;  
+    print STDOUT "### Localize\n";
+    my $localizehash_ref;
     my ( $bAll , $bUseLocalize, $langhash_ref , $bHasSourceLanguage , 
$bFakeEnglish ) = parseLanguages();
-    
+
     # Enable autoflush on STDOUT
-    # $| = 1; 
+    # $| = 1;
     STDOUT->autoflush( 1 );
 
     my $working_path = getcwd();
@@ -366,19 +366,19 @@ sub collectfiles{
     add_paths( $langhash_ref );
 
     my ( $LOCALIZEPARTICLE , $localizeSDF ) = File::Temp::tempfile();
-    close( $LOCALIZEPARTICLE ); 
+    close( $LOCALIZEPARTICLE );
 
     my ( $ALLPARTICLES_MERGED , $particleSDF_merged )     = 
File::Temp::tempfile();
-    close( $ALLPARTICLES_MERGED ); 
+    close( $ALLPARTICLES_MERGED );
     my ( $LOCALIZE_LOG , $my_localize_log ) = File::Temp::tempfile();
     close( $LOCALIZE_LOG );
-    
+
     ## Get the localize en-US extract
     if( $bAll || $bUseLocalize ){
         print "### Fetching source language strings\n";
         my $command = "";
         my $args    = "";
-        
+
         if( $ENV{WRAPCMD} ){
             $command = $ENV{WRAPCMD}.$binpath."localize_sl";
         }else{
@@ -398,36 +398,36 @@ sub collectfiles{
                 push @list , $isokey;
                 if( $langhash_ref->{ $isokey } ne "" ){
                     push @list , $langhash_ref->{ $isokey };
-                } 
+                }
               }
               remove_duplicates( \@list );
               foreach my $isokey ( @list ){
                 switch :{
-                       ( $isokey=~ /^en-US$/i  ) 
-                        && do{  
+                       ( $isokey=~ /^en-US$/i  )
+                        && do{
                                 if( $bFlag eq "TRUE" ){ $args .= ",en-US"; }
-                                else {     
-                                    $args .= "en-US";  $bFlag = "TRUE"; 
+                                else {
+                                    $args .= "en-US";  $bFlag = "TRUE";
                                  }
                               };
-                                        
+
                     } #switch
-                } #foreach
-              } # if 
+                } #for each
+              } # if
         } # if
         if ( $bVerbose ) { print STDOUT $command.$args."\n"; }
-        
+
         my $rc = system( $command.$args );
 
         if( $rc < 0 ){    print STDERR "ERROR: localize rc = $rc\n"; exit( -1 
); }
         ( $localizehash_ref )  = read_file( $localizeSDF , $langhash_ref );
-     
+
     }
     ## Get sdf particles
 #*****************
-    open ALLPARTICLES_MERGED , "+>> $particleSDF_merged" 
-    or die "Can't open $particleSDF_merged"; 
-    
+    open ALLPARTICLES_MERGED , "+>> $particleSDF_merged"
+    or die "Can't open $particleSDF_merged";
+
     ## Fill fackback hash
     my( $fallbackhashhash_ref ) = fetch_fallback( \@sdfparticles , 
$localizeSDF ,  $langhash_ref );
     my %block;
@@ -452,9 +452,9 @@ sub collectfiles{
                             my $gid            = defined $7 ? $7 : '';
                             my $lid            = defined $8 ? $8 : '';
                             my $lang           = defined $12 ? $12 : '';
-                            my $platform       = defined $10 ? $10 : ''; 
+                            my $platform       = defined $10 ? $10 : '';
                             my $helpid         = defined $9 ? $9 : '';
-                            
+
                             chomp( $line );
 
                             if ( $lang eq $cur_lang ){
@@ -470,12 +470,12 @@ sub collectfiles{
             }
 
             foreach my $line ( keys( %{$fallbackhashhash_ref->{ $cur_lang } } 
)) {
-                if( #$cur_lang ne "de" && 
+                if( #$cur_lang ne "de" &&
                     $cur_lang ne "en-US" ){
                     print ALLPARTICLES_MERGED ( $fallbackhashhash_ref->{ 
$cur_lang }{ $line }, "\n" );
                 }
              }
-        } 
+        }
     } else {
         foreach my $currentfile ( @sdfparticles ){
             if ( open MYFILE , "< $currentfile" ) {
@@ -487,17 +487,17 @@ sub collectfiles{
         }
     }
     close ALLPARTICLES_MERGED;
-    
+
     # Hash of array
     my %output;
     my @order;
-    
+
     ## Join both
     if( $outputfile ){
         if( open DESTFILE , "+> $outputfile" ){
-            if( !open LOCALIZEPARTICLE ,  "< $localizeSDF" ) { print STDERR 
"ERROR: Can't open file $localizeSDF\n"; } 
+            if( !open LOCALIZEPARTICLE ,  "< $localizeSDF" ) { print STDERR 
"ERROR: Can't open file $localizeSDF\n"; }
             if( !open ALLPARTICLES_MERGED , "< $particleSDF_merged" ) { print 
STDERR "ERROR: Can't open file $particleSDF_merged\n"; }
-                
+
             # Insert localize
             my $extract_date="";
             while ( <LOCALIZEPARTICLE> ){
@@ -513,16 +513,16 @@ sub collectfiles{
                     my $gid            = defined $7 ? $7 : '';
                     my $lid            = defined $8 ? $8 : '';
                     #my $lang           = defined $12 ? $12 : '';
-                    my $platform       = defined $10 ? $10 : ''; 
+                    my $platform       = defined $10 ? $10 : '';
                     my $helpid         = defined $9 ? $9 : '';
- 
-                    
+
+
                     if( $use_default_date )
                     {
-                        $extract_date = "$default_date\n" ; 
+                        $extract_date = "$default_date\n" ;
                     }
-                    elsif( $extract_date eq "" ) {  
-                        $extract_date = $timestamp ; 
+                    elsif( $extract_date eq "" ) {
+                        $extract_date = $timestamp ;
                         $extract_date =~ tr/\r\n//d;
                         $extract_date .= "\n";
                     }
@@ -530,18 +530,18 @@ sub collectfiles{
                     if( $bAll ){ print DESTFILE 
$leftpart."\t".$lang."\t".$rightpart.$extract_date ; }
                     else {
                         foreach my $sLang ( keys( %{ $langhash_ref } ) ){
-                            if( $sLang=~ /all/i )                       {  
+                            if( $sLang=~ /all/i )                       {
                                 push @{ $output{ 
$prj.$gid.$lid.$file.$type.$platform.$helpid } } ,  
$leftpart."\t".$lang."\t".$rightpart.$extract_date ;
-                                #print DESTFILE 
$leftpart."\t".$lang."\t".$rightpart.$extract_date;  
+                                #print DESTFILE 
$leftpart."\t".$lang."\t".$rightpart.$extract_date;
                             }
-                            #if( $sLang eq "de" && $lang eq "de" )       {  
+                            #if( $sLang eq "de" && $lang eq "de" )       {
                             #    push @{ $output{ 
$prj.$gid.$lid.$file.$type.$platform.$helpid } } ,  
$leftpart."\t".$lang."\t".$rightpart.$extract_date ;
-                                #print DESTFILE 
$leftpart."\t".$lang."\t".$rightpart.$extract_date;  
+                                #print DESTFILE 
$leftpart."\t".$lang."\t".$rightpart.$extract_date;
                                 #}
-                            if( $sLang eq "en-US" && $lang eq "en-US" ) {  
+                            if( $sLang eq "en-US" && $lang eq "en-US" ) {
                                 push @order , 
$prj.$gid.$lid.$file.$type.$platform.$helpid;
                                 if( !$bFakeEnglish ){ push @{ $output{ 
$prj.$gid.$lid.$file.$type.$platform.$helpid } } ,  
$leftpart."\t".$lang."\t".$rightpart.$extract_date ; }
-                                #print DESTFILE 
$leftpart."\t".$lang."\t".$rightpart.$extract_date;  
+                                #print DESTFILE 
$leftpart."\t".$lang."\t".$rightpart.$extract_date;
                             }
 
                         }
@@ -563,22 +563,22 @@ sub collectfiles{
                     my $gid            = defined $7 ? $7 : '';
                     my $lid            = defined $8 ? $8 : '';
                     #my $lang           = defined $12 ? $12 : '';
-                    my $platform       = defined $10 ? $10 : ''; 
+                    my $platform       = defined $10 ? $10 : '';
                     my $helpid         = defined $9 ? $9 : '';
- 
-                    
+
+
                     if( $use_default_date )
                     {
-                        $extract_date = "$default_date\n" ; 
+                        $extract_date = "$default_date\n" ;
                     }
-                    elsif( $extract_date eq "" ) 
-                    { 
-                        $extract_date = $timestamp; 
+                    elsif( $extract_date eq "" )
+                    {
+                        $extract_date = $timestamp;
                     }
 
-                    if( ! ( $prj =~ /binfilter/i ) ) { 
-                        push @{ $output{ 
$prj.$gid.$lid.$file.$type.$platform.$helpid } } , 
$leftpart."\t".$lang."\t".$rightpart.$extract_date ; 
-                        #print DESTFILE 
$leftpart."\t".$lang."\t".$rightpart.$extract_date ; 
+                    if( ! ( $prj =~ /binfilter/i ) ) {
+                        push @{ $output{ 
$prj.$gid.$lid.$file.$type.$platform.$helpid } } , 
$leftpart."\t".$lang."\t".$rightpart.$extract_date ;
+                        #print DESTFILE 
$leftpart."\t".$lang."\t".$rightpart.$extract_date ;
                     }
                  }
             }
@@ -590,8 +590,8 @@ sub collectfiles{
                         print DESTFILE $line;
                     }
                 }
-            } 
-        
+            }
+
         }else { print STDERR "Can't open $outputfile";}
     }
     close DESTFILE;
@@ -599,9 +599,9 @@ sub collectfiles{
     close ALLPARTICLES_MERGED;
     chdir $working_path;
 
-    #print STDOUT "DBG: \$localizeSDF $localizeSDF \$particleSDF_merged 
$particleSDF_merged\n";    
+    #print STDOUT "DBG: \$localizeSDF $localizeSDF \$particleSDF_merged 
$particleSDF_merged\n";
     unlink $localizeSDF , $particleSDF_merged ,  $my_localize_log;
-    
+
     #sort_outfile( $outputfile );
     #remove_obsolete( $outputfile ) , if $bHasSourceLanguage ne "";
     }
@@ -612,7 +612,7 @@ sub remove_obsolete{
     my @lines;
     my $enusleftpart;
     my @good_lines;
-    
+
     print STDOUT "### Removing obsolete strings\n";
 
     # Kick out all strings without en-US reference
@@ -626,11 +626,11 @@ sub remove_obsolete{
                 my $type           = defined $6 ? $6 : '';
                 my $gid            = defined $7 ? $7 : '';
                 my $lid            = defined $8 ? $8 : '';
-                my $platform       = defined $10 ? $10 : ''; 
+                my $platform       = defined $10 ? $10 : '';
                 my $helpid         = defined $9 ? $9 : '';
-                
+
                 my $leftpart = $prj.$gid.$lid.$file.$type.$platform.$helpid;
-                
+
                 if( $language eq "en-US" ){                 # source string 
found, 1. entry
                     $enusleftpart = $leftpart;
                     push @good_lines , $line;
@@ -646,12 +646,12 @@ sub remove_obsolete{
                     #else{
                     #    print STDERR "OUT:  \$enusleftpart=$enusleftpart 
\$leftpart=$leftpart \$line=$line\n";
                     #}
-                }            
+                }
             }
-        }    
+        }
         close SORTEDFILE;
     } else { print STDERR "ERROR: Can't open file $outfile\n";}
-    
+
     # Write file
     if ( open ( SORTEDFILE , "> $outfile" ) ){
         foreach my $newline ( @good_lines ) {
@@ -667,32 +667,32 @@ sub sort_outfile{
         print STDOUT "### Sorting ... $outfile ...";
         my @lines;
         my @sorted_lines;
-        
-        
+
+
         #if ( open ( SORTEDFILE , "< $outputfile" ) ){
         if ( open ( SORTEDFILE , "< $outfile" ) ){
             my $line;
             while ( <SORTEDFILE> ){
                 $line = $_;
-                if( $line =~ /^[^\#]/ ){ 
-                    push @lines , $line; 
+                if( $line =~ /^[^\#]/ ){
+                    push @lines , $line;
                 }
             }
             close SORTEDFILE;
             @sorted_lines = sort {
-                my $xa_lang          = "";      
-                my $xa_left_part    = "";
+                my $xa_lang          = "";
+                my $xa_left_part     = "";
                 my $xa_right_part    = "";
                 my $xa_timestamp     = "";
-                my $xb_lang          = "";      
-                my $xb_left_part    = "";
+                my $xb_lang          = "";
+                my $xb_left_part     = "";
                 my $xb_right_part    = "";
                 my $xb_timestamp     = "";
                 my $xa               = "";
                 my $xb               = "";
                 my @alist;
                 my @blist;
-                
+
                 if( $a=~ /$sdf_regex/ ){
                     $xa_left_part       = defined $2 ? $2 : '';
                     $xa_lang           = defined $12 ? $12 : '';
@@ -707,7 +707,7 @@ sub sort_outfile{
                     $xb_left_part = remove_last_column( $xb_left_part );
 
 
-                } 
+                }
                 if( (  $xa_left_part cmp $xb_left_part ) == 0 ){         # 
Left part equal
                      if( ( $xa_lang cmp $xb_lang ) == 0 ){               # 
Lang equal
                          return ( $xa_right_part cmp $xb_right_part );   # 
Right part compare
@@ -716,18 +716,18 @@ sub sort_outfile{
                     elsif( $xb_lang eq "en-US" ) { return 1;  }        # en-US 
wins
                     else { return $xa_lang cmp $xb_lang; }             # lang 
compare
                 }
-                else { 
+                else {
                     return $xa_left_part cmp $xb_left_part;        # Left part 
compare
                 }
             } @lines;
-            
+
             if ( open ( SORTEDFILE , "> $outfile" ) ){
                 print SORTEDFILE get_license_header();
                 foreach my $newline ( @sorted_lines ) {
                     print SORTEDFILE $newline;
                     #print STDOUT $newline;
-                }            
-            } 
+                }
+            }
             close SORTEDFILE;
         } else { print STDERR "WARNING: Can't open file $outfile\n";}
        print "done\n";
@@ -743,18 +743,18 @@ sub remove_last_column{
 
 #########################################################
 sub rename_language{
-    my $fallbackhashhash_ref    = shift; 
+    my $fallbackhashhash_ref    = shift;
     my $cur_fallback            = shift;
     my $cur_lang                = shift;
     my $line;
-      
+
     foreach my $key( keys ( %{ $fallbackhashhash_ref->{ $cur_fallback } } ) ){
         $line = $fallbackhashhash_ref->{ $cur_fallback }{ $key };
         if( $line =~ /$sdf_regex/ ){
             my $leftpart       = defined $2 ? $2 : '';
             my $lang           = defined $12 ? $12 : '';
             my $rightpart      = defined $13 ? $13 : '';
-                
+
             $fallbackhashhash_ref->{ $cur_lang }{ $key } = 
$leftpart."\t".$cur_lang."\t".$rightpart;
         }
     }
@@ -772,35 +772,35 @@ sub remove_duplicates{
 sub fetch_fallback{
     my $sdfparticleslist_ref   = shift;
     my $localizeSDF            = shift;
-    my $langhash_ref           = shift; 
+    my $langhash_ref           = shift;
     my %fallbackhashhash;
     my $cur_lang;
     my @langlist;
-    
+
     foreach my $key ( keys ( %{ $langhash_ref } ) ){
         $cur_lang = $langhash_ref->{ $key };
         if ( $cur_lang ne "" ) {
             push @langlist , $cur_lang;
         }
     }
-    remove_duplicates( \@langlist ); 
-    foreach  $cur_lang ( @langlist ){ 
+    remove_duplicates( \@langlist );
+    foreach  $cur_lang ( @langlist ){
         if( $cur_lang eq "en-US" ){
             read_fallbacks_from_source( $localizeSDF , $cur_lang , 
\%fallbackhashhash );
         }
     }
-    
+
     # remove de / en-US
     my @tmplist;
     foreach $cur_lang( @langlist ){
         if(  $cur_lang ne "en-US" ){
            push @tmplist , $cur_lang;
- 
+
         }
     }
     @langlist = @tmplist;
-    if ( $#langlist +1 ){ 
-        read_fallbacks_from_particles( $sdfparticleslist_ref , \@langlist , 
\%fallbackhashhash ); 
+    if ( $#langlist +1 ){
+        read_fallbacks_from_particles( $sdfparticleslist_ref , \@langlist , 
\%fallbackhashhash );
 
     }
     return (\%fallbackhashhash);
@@ -808,27 +808,27 @@ sub fetch_fallback{
 
 #########################################################
 sub write_file{
-  
+
     my $localizeFile = shift;
     my $index_ref    = shift;
-    
+
     if( open DESTFILE , "+> $localizeFile" ){
         foreach my $key( %{ $index_ref } ){
             print DESTFILE ($index_ref->{ $key }, "\n" );
         }
         close DESTFILE;
     }else {
-      print STDERR "Can't open/create '$localizeFile'";  
+      print STDERR "Can't open/create '$localizeFile'";
     }
 }
 
 #########################################################
 sub read_file{
-    
+
     my $sdffile         = shift;
     my $langhash_ref    = shift;
     my %block           = ();
-    
+
     open MYFILE , "< $sdffile"
         or die "Can't open '$sdffile'\n";
         while( <MYFILE>){
@@ -842,7 +842,7 @@ sub read_file{
             my $platform       = defined $10 ? $10 : '';
             my $lang           = defined $12 ? $12 : '';
             my $helpid         = defined $9 ? $9 : '';
-            
+
             foreach my $isolang ( keys ( %{ $langhash_ref } ) ){
                 if( $isolang=~ /$lang/i || $isolang=~ /all/i ) { 
$block{$prj.$gid.$lid.$file.$type.$platform.$helpid } =  $line ; }
             }
@@ -853,7 +853,7 @@ sub read_file{
 
 #########################################################
 sub read_fallbacks_from_particles{
-    
+
     my $sdfparticleslist_ref    = shift;
     my $isolanglist_ref         = shift;
     my $fallbackhashhash_ref    = shift;
@@ -869,14 +869,14 @@ sub read_fallbacks_from_particles{
                     my $gid            = defined $7 ? $7 : '';
                     my $lid            = defined $8 ? $8 : '';
                     my $lang           = defined $12 ? $12 : '';
-                    my $platform       = defined $10 ? $10 : ''; 
+                    my $platform       = defined $10 ? $10 : '';
                     my $helpid         = defined $9 ? $9 : '';
-                          
+
                     chomp( $line );
-             
+
                     foreach my $isolang ( @{$isolanglist_ref}  ){
-                        if( $isolang=~ /$lang/i ) { 
-                            $fallbackhashhash_ref->{ $isolang }{ 
$prj.$gid.$lid.$file.$type.$platform.$helpid } =  $line ; 
+                        if( $isolang=~ /$lang/i ) {
+                            $fallbackhashhash_ref->{ $isolang }{ 
$prj.$gid.$lid.$file.$type.$platform.$helpid } =  $line ;
                         }
                     }
                 }
@@ -887,15 +887,15 @@ sub read_fallbacks_from_particles{
 
 #########################################################
 sub read_fallbacks_from_source{
-    
+
     my $sdffile                 = shift;
     my $isolang                 = shift;
     my $fallbackhashhash_ref    = shift;
     my $block_ref;
-    # read fallback for single file 
+    # read fallback for single file
     open MYFILE , "< $sdffile"
         or die "Can't open '$sdffile'\n";
-    
+
     while( <MYFILE>){
           if( /$sdf_regex/ ){
             my $line           = defined $_ ? $_ : '';
@@ -907,9 +907,9 @@ sub read_fallbacks_from_source{
             my $helpid         = defined $9 ? $9 : '';
             my $lang           = defined $12 ? $12 : '';
             my $platform       = defined $10 ? $10 : '';
-            
-            chomp( $line ); 
-            if( $isolang=~ /$lang/i ) { $fallbackhashhash_ref->{ $isolang }{ 
$prj.$gid.$lid.$file.$type.$platform.$helpid } =  $line ; 
+
+            chomp( $line );
+            if( $isolang=~ /$lang/i ) { $fallbackhashhash_ref->{ $isolang }{ 
$prj.$gid.$lid.$file.$type.$platform.$helpid } =  $line ;
             }
         }
     }
@@ -925,7 +925,7 @@ sub parseLanguages{
     my %langhash;
     my $iso="";
     my $fallback="";
-  
+
     #### -l all
     if(   $languages=~ /all/ ){
         $bAll = "TRUE";
@@ -938,13 +938,13 @@ sub parseLanguages{
             if( $lang=~ 
/([a-zA-Z]{2,3}(-[a-zA-Z\-]*)*)(=([a-zA-Z]{2,3}(-[a-zA-Z\-]*)*))?/ ){
                 $iso        = $1;
                 $fallback   = $4;
-                
+
                 if( ( $iso && $iso=~ /(en-US)/i )  || ( $fallback && 
$fallback=~ /(en-US)/i ) ) {
                     $bUseLocalize = "TRUE";
                 }
                 if( ( $iso && $iso=~ /(en-US)/i ) ) {
                     $bHasSourceLanguage = "TRUE";
-                } 
+                }
              if( $fallback ) { $langhash{ $iso } = $fallback;   }
              else            { $langhash{ $iso } = "";          }
             }
@@ -962,11 +962,11 @@ sub parseLanguages{
             }
             if( ( $iso && $iso=~ /(en-US)/i )  ) {
                 $bHasSourceLanguage = "TRUE";
-            } 
+            }
 
              if( $fallback ) { $langhash{ $iso } = $fallback;   }
              else            { $langhash{ $iso } = "";          }
-        }    
+        }
     }
     # HACK en-US always needed!
     if( !$bHasSourceLanguage ){
@@ -980,15 +980,15 @@ sub parseLanguages{
 
 #########################################################
 sub parse_options{
- 
+
     my $help;
     my $merge;
     my $extract;
-    my $success = GetOptions('f=s' => \$sdffile , 'l=s' => \$languages , 's=s' 
=> \$srcpath ,  'h' => \$help , 'v' => \$bVerbose , 
+    my $success = GetOptions('f=s' => \$sdffile , 'l=s' => \$languages , 's=s' 
=> \$srcpath ,  'h' => \$help , 'v' => \$bVerbose ,
                              'm' => \$merge , 'e' => \$extract , 'x' => 
\$no_sort , 'd' => \$use_default_date , 'c' => \$create_dirs ,
                              'n' => \$no_gsicheck , 'o' => \$force_ooo_module 
);
     $outputfile = $sdffile;
-    
+
     #print STDOUT "DBG: lang = $languages\n";
     if( !$srcpath ){
         $srcpath = "$ENV{SRC_ROOT}";
@@ -1008,7 +1008,7 @@ sub parse_options{
     }
     if( $merge && $sdffile && ! ( -r $sdffile)){
         print STDERR "Can't open file '$sdffile'\n";
-        exit(1);    
+        exit(1);
     }
     if( !( $languages=~ 
/[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*(=[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*)?(,[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*(=[a-zA-Z]{2,3}(-[a-zA-Z\-]*)*)?)*/
 ) ){
         print STDERR "Please check the -l iso code\n";
@@ -1032,22 +1032,21 @@ sub usage{
     print STDERR "Options:\n";
     print STDERR "    -h              help\n";
     print STDERR "    -m              Merge mode\n";
-    print STDERR "    -e              Extract mode\n"; 
+    print STDERR "    -e              Extract mode\n";
     print STDERR "    -f <sdffile>    To split a big SDF file into 
particles\n";
     print STDERR "       <outputfile> To collect and join all particles to one 
big file\n";
     print STDERR "    -s <sourceroot> Path to the modules, if no \$SRC_ROOT is 
set\n";
     print STDERR "    -l ( all | <isocode> | <isocode>=fallback ) comma 
separated languages\n";
     print STDERR "    -d              Use default date in extracted sdf 
file\n";
     print STDERR "    -c              Create needed directories\n";
-    print STDERR "    -g              Sort sdf file before mergeing\n";
+    print STDERR "    -g              Sort sdf file before merging\n";
     print STDERR "    -h              File with localize.sdf's\n!";
-    print STDERR "    -n              No gsicheck\n"; 
+    print STDERR "    -n              No gsicheck\n";
     print STDERR "    -i              Module to merge\n";
-    print STDERR "    -o              force using ooo localization from the 
l10n module instead of l10n_so; \n";
-    print STDERR "                    useful if the type can't be detected by 
the .svn tags; \n";
+    print STDERR "    -o              force using AOO localization from the 
l10n module instead of l10n_so;\n";
+    print STDERR "                    useful if the type can't be detected by 
the .svn tags;\n";
     print STDERR "    -v              Verbose\n";
     print STDERR "\nExample:\n";
     print STDERR "\nlocalize -e -l en-US,pt-BR=en-US -f my.sdf\n( Extract 
en-US and pt-BR with en-US fallback )\n";
-    print STDERR "\nlocalize -m -l cs -f my.sdf\n( Merge cs translation into 
the sourcecode ) \n";
+    print STDERR "\nlocalize -m -l cs -f my.sdf\n( Merge cs translation into 
the sourcecode )\n";
 }
-

Reply via email to