diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-10-02 14:20:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-10-02 14:20:16 +0000 |
| commit | 42d2f0954a100fbea5ff5f02d194593ebbf22c77 (patch) | |
| tree | 93f929432b9d4053e114af04fbb16e0084f218b7 /solenv | |
| parent | a8838575f203460d2f8fbeddf83db98a08456e4b (diff) | |
INTEGRATION: CWS native111 (1.38.42); FILE MERGED
2007/09/25 11:22:16 is 1.38.42.1: #i81903# DEFAULT_TO_ENGLISH_FOR_PACKING changes only source, no longer destination
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 60120bc900bf..b0e8bd6c2488 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -4,9 +4,9 @@ # # $RCSfile: scriptitems.pm,v $ # -# $Revision: 1.38 $ +# $Revision: 1.39 $ # -# last change: $Author: ihi $ $Date: 2007-08-20 15:26:30 $ +# last change: $Author: kz $ $Date: 2007-10-02 15:20:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -889,18 +889,19 @@ sub get_Source_Directory_For_Files_From_Includepathlist my $oldname = $onefile->{'Name'}; my $oldlanguage = $onefile->{'specificlanguage'}; my $newlanguage = "en-US"; - $onefile->{'Name'} =~ s/$oldlanguage\./$newlanguage\./; # Example: tplwizfax_it.zip -> tplwizfax_en-US.zip + # $onefile->{'Name'} =~ s/$oldlanguage\./$newlanguage\./; # Example: tplwizfax_it.zip -> tplwizfax_en-US.zip $onefilename = $onefile->{'Name'}; + $onefilename =~ s/$oldlanguage\./$newlanguage\./; # Example: tplwizfax_it.zip -> tplwizfax_en-US.zip $onefilename =~ s/^\s*\Q$installer::globals::separator\E//; # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs $sourcepathref = get_sourcepath_from_filename_and_includepath(\$onefilename, $includepatharrayref, 1); $onefile->{'sourcepath'} = $$sourcepathref; # This $$sourcepathref is empty, if no source was found if ($onefile->{'sourcepath'}) # defaulting to english was successful { - $infoline = "WARNING: Using $onefile->{'Name'} instead of $oldname\n"; + $infoline = "WARNING: Using $onefilename instead of $oldname\n"; push( @installer::globals::logfileinfo, $infoline); print " $infoline"; - if ( $onefile->{'destination'} ) { $onefile->{'destination'} =~ s/\Q$oldname\E/$onefile->{'Name'}/; } + # if ( $onefile->{'destination'} ) { $onefile->{'destination'} =~ s/\Q$oldname\E/$onefile->{'Name'}/; } # If the directory, in which the new file is installed, is not language dependent, # the filename has to be changed to avoid installation conflicts |