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

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))
                 {