strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS c05v001 (1.6.172); FILE MERGED

Browse source 
2005/10/21 13:30:27 is 1.6.172.1: #126263# neutral codepage for en-US in c05office
This commit is contained in:
Kurt Zenker 2005-11-11 13:18:01 +00:00
parent c890c7dce8
commit e34ffdaded
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
solenv/bin/modules/installer/windows/language.pm
View file

@ -4,9 +4,9 @@
#
# $RCSfile: language.pm,v $
#
# $Revision: 1.7 $
# $Revision: 1.8 $
#
# last change: $Author: rt $ $Date: 2005-09-08 09:19:05 $
# last change: $Author: kz $ $Date: 2005-11-11 14:18:01 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -74,7 +74,7 @@ sub get_windows_encoding
if ( $windowsencoding eq "0" ) { $windowsencoding = "65001"; } # languages with "0" have to be available in UTF-8 (65001)
# Asian multilingual installation sets need a code neutral Windows Installer database -> $windowsencoding = 0
if (( $language eq "en-US" ) && (( $installer::globals::product =~ /suitemulti/i ) || ( $installer::globals::product =~ /officemulti/i ))) { $windowsencoding = "0"; }
if (( $language eq "en-US" ) && (( $installer::globals::product =~ /suitemulti/i ) || ( $installer::globals::product =~ /officemulti/i ) || ( $installer::globals::product =~ /c05office/i ))) { $windowsencoding = "0"; }
return $windowsencoding;
}