diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 08:52:02 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 08:52:02 +0000 |
| commit | 7e72c3127ec5f5f28cca46942b94f902b17edbf7 (patch) | |
| tree | 6363985b5b067dfc54835da19a850dcb50a1ecc7 /solenv | |
| parent | ec8bf7f3180191efeceaac11fc1680692062fc2a (diff) | |
INTEGRATION: CWS native100 (1.12.4); FILE MERGED
2007/08/24 15:16:28 is 1.12.4.2: #i80938# shifting package information
2007/08/23 15:10:33 is 1.12.4.1: #i80937,i80938# introducing module order, package restructuring
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/languagepack.pm | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm index a13365a8b22f..c6f988d975b8 100644 --- a/solenv/bin/modules/installer/languagepack.pm +++ b/solenv/bin/modules/installer/languagepack.pm @@ -4,9 +4,9 @@ # # $RCSfile: languagepack.pm,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: ihi $ $Date: 2007-08-20 15:25:53 $ +# last change: $Author: kz $ $Date: 2007-09-06 09:52:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -82,25 +82,29 @@ sub select_language_items for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages { my $onelanguage = ${$languagesarrayref}[$j]; + my $locallang = $onelanguage; + $locallang =~ s/-/_/; if ( $specificlanguage eq $onelanguage ) { - $oneitem->{'modules'} = $installer::globals::rootmodulegid; # all files in a language pack are root files + # $oneitem->{'modules'} = $installer::globals::rootmodulegid; # all files in a language pack are root files + # Using $installer::globals::languagemodulesbase (?) + $oneitem->{'modules'} = $installer::globals::rootmodulegid . "_$locallang"; # all files in a language pack are root files if (( $installer::globals::islinuxbuild ) || ( $installer::globals::issolarispkgbuild )) { if ( $oneitem->{'Dir'} ) { - if ( $oneitem->{'Dir'} eq "gid_Dir_Fonts_Truetype" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Fonts"; } - if ( $oneitem->{'Dir'} eq "gid_Dir_Resource" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Resource"; } - if ( $oneitem->{'Dir'} eq "gid_Dir_Help_Isolanguage" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Help"; } + if ( $oneitem->{'Dir'} eq "gid_Dir_Fonts_Truetype" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Fonts_$locallang"; } + if ( $oneitem->{'Dir'} eq "gid_Dir_Resource" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Resource_$locallang"; } + if ( $oneitem->{'Dir'} eq "gid_Dir_Help_Isolanguage" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Help_$locallang"; } } } # preparing different modules for Windows Installer language packs - my $underlinelanguage = $specificlanguage; - $underlinelanguage =~ s/-/_/; - if ( $installer::globals::iswindowsbuild ) { $oneitem->{'modules'} = $installer::globals::languagemodulesbase . $underlinelanguage; } + # my $underlinelanguage = $specificlanguage; + # $underlinelanguage =~ s/-/_/; + # if ( $installer::globals::iswindowsbuild ) { $oneitem->{'modules'} = $installer::globals::languagemodulesbase . $underlinelanguage; } if (! installer::existence::exists_in_array($oneitem->{'modules'}, \@installer::globals::languagepackfeature)) { |