diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-21 10:56:39 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-21 10:56:39 +0000 |
| commit | b2aabd6c9bf19234906a8ccdf54f9be9546250a1 (patch) | |
| tree | e3e40cd3945494681ef567b04d3c946ddb5fae36 /solenv/bin/modules/installer/download.pm | |
| parent | a58165cd675ed0d49d4d4c0689659fe16906d820 (diff) | |
INTEGRATION: CWS native152 (1.38.46); FILE MERGED
2008/05/19 10:34:21 is 1.38.46.1: #i88939# shorter installation path for multi lingual installation sets
Diffstat (limited to 'solenv/bin/modules/installer/download.pm')
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 3db346f88d91..22f6e105d937 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -8,7 +8,7 @@ # # $RCSfile: download.pm,v $ # -# $Revision: 1.39 $ +# $Revision: 1.40 $ # # This file is part of OpenOffice.org. # @@ -829,6 +829,8 @@ sub put_windows_productpath_into_template my $locallangs = $$languagestringref; $locallangs =~ s/_/ /g; + if (length($locallangs) > $installer::globals::max_lang_length) { $locallangs = "multi lingual"; } + if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . $locallangs . ")"; } replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath); |