INTEGRATION: CWS ooo20l10n (1.16.22); FILE MERGED

2005/06/10 09:51:02 is 1.16.22.1: #i49581# adding english automatically for languages not supported by Windows
This commit is contained in:
Rüdiger Timm 2005-06-24 10:37:49 +00:00
parent 029f4a863b
commit c95b73da4b

View file

@ -2,9 +2,9 @@
#
# $RCSfile: download.pm,v $
#
# $Revision: 1.17 $
# $Revision: 1.18 $
#
# last change: $Author: hr $ $Date: 2005-06-09 13:54:58 $
# last change: $Author: rt $ $Date: 2005-06-24 11:37:49 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -1029,6 +1029,18 @@ sub get_translation_file
return $translationfile;
}
####################################################
# Removing english, if it was added before
####################################################
sub remove_english_for_nsis_installer
{
my ($languagestringref, $languagesarrayref) = @_;
# $$languagestringref =~ s/en-US_//;
shift(@{$languagesarrayref});
}
####################################################
# Creating download installation sets
####################################################
@ -1046,6 +1058,9 @@ sub create_download_sets
# special handling for unix multi language installation sets
if ( $installer::globals::is_unix_multi ) { $languagestringref = \$installer::globals::unixmultipath; }
# special handling for installation sets, to which english was added automatically
if ( $installer::globals::added_english ) { remove_english_for_nsis_installer($languagestringref, $languagesarrayref); }
my $firstdir = $installationdir;
installer::pathanalyzer::get_path_from_fullqualifiedname(\$firstdir);