diff options
author | Petr Mladek <pmladek@suse.cz> | 2010-12-17 19:24:55 +0100 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2010-12-17 19:24:55 +0100 |
commit | 672fafbd5b5d842a657b36090c375ce840fd6508 (patch) | |
tree | f6b99da43724744838426c6f09117edb864e2fc5 | |
parent | f876e724eef52dd619432e202941cda9904ffeef (diff) |
do not ingnore language specific help files
-rw-r--r-- | solenv/bin/modules/installer/helppack.pm | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/solenv/bin/modules/installer/helppack.pm b/solenv/bin/modules/installer/helppack.pm index 17fcdad5d..21d2f0460 100644 --- a/solenv/bin/modules/installer/helppack.pm +++ b/solenv/bin/modules/installer/helppack.pm @@ -50,40 +50,41 @@ sub select_help_items { my $oneitem = ${$itemsref}[$i]; - my $ismultilingual = $oneitem->{'ismultilingual'}; - - if (!($ismultilingual)) + my $styles = ""; + if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; } + + if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) { # Files with style "HELPPACK" and "FORCEHELPPACK" also have to be included into the help pack. # Files with style "HELPPACK" are only included into help packs. # Files with style "FORCEHELPPACK" are included into help packs and non help packs. They are # forced, because otherwise they not not be included into helppacks. - - my $styles = ""; - if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; } - - if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) { push(@itemsarray, $oneitem); } - - next; # single language files are not included into help pack - } - if (0) { - my $specificlanguage = ""; - if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; } - - for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages - { - my $onelanguage = ${$languagesarrayref}[$j]; - my $locallang = $onelanguage; - $locallang =~ s/-/_/; - - if ( $specificlanguage eq $onelanguage ) + my $ismultilingual = $oneitem->{'ismultilingual'}; + + if ($ismultilingual) { - push(@itemsarray, $oneitem); + my $specificlanguage = ""; + if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; } + + for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages + { + my $onelanguage = ${$languagesarrayref}[$j]; + my $locallang = $onelanguage; + $locallang =~ s/-/_/; + + if ( $specificlanguage eq $onelanguage ) + { + push(@itemsarray, $oneitem); + } + } + } + else + { + push(@itemsarray, $oneitem); } } } - } return \@itemsarray; } |