strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS native111 (1.38.42); FILE MERGED

Browse source 
2007/09/25 11:22:16 is 1.38.42.1: #i81903# DEFAULT_TO_ENGLISH_FOR_PACKING changes only source, no longer destination
This commit is contained in:
Kurt Zenker 2007-10-02 14:20:16 +00:00
parent a8838575f2
commit 42d2f0954a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
solenv/bin/modules/installer/scriptitems.pm
View file

@ -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