diff options
author | Tim Retout <tim@retout.co.uk> | 2012-09-01 10:58:25 +0100 |
---|---|---|
committer | Tim Retout <tim@retout.co.uk> | 2012-09-01 19:43:03 +0100 |
commit | a3f8156e0dfeff671a6e200075e727b1f037382c (patch) | |
tree | 2d841a7cca5faa6ba6c18f829b25662554c87280 | |
parent | 4e38a1c87054ad5eba329681741bf91efe8b1d37 (diff) |
installer: Make @noMSLocaleLangs non-global.
Change-Id: Iae7afa53966a4f5fe3b09ce75dcefc78fd75b279
-rwxr-xr-x | i18npool/source/isolang/langid.pl | 4 | ||||
-rw-r--r-- | solenv/bin/modules/installer/globals.pm | 64 | ||||
-rw-r--r-- | solenv/bin/modules/installer/languages.pm | 69 |
3 files changed, 69 insertions, 68 deletions
diff --git a/i18npool/source/isolang/langid.pl b/i18npool/source/isolang/langid.pl index 0e1c323b4217..fcccd53b7a90 100755 --- a/i18npool/source/isolang/langid.pl +++ b/i18npool/source/isolang/langid.pl @@ -30,7 +30,7 @@ sub Usage() "\n", "langid - a hackish utility to lookup lang.h language defines and LangIDs,\n", "isolang.cxx ISO639/ISO3166 mapping, locale data files, langtab.src language\n", - "listbox entries, langlist.mk, file_ooo.scp registry name, globals.pm and\n", + "listbox entries, langlist.mk, file_ooo.scp registry name, languages.pm and\n", "msi-encodinglist.txt\n\n", "Usage: $0 [--single] {language string} | {LangID} | {primarylanguage sublanguage} | {language-country}\n\n", @@ -400,7 +400,7 @@ sub main() # @noMSLocaleLangs = ( "br", "bs", ... ) grepFile( '^\s*@noMSLocaleLangs\s*=\s*\(\s*(\s*"([a-z]{2,3})(-[A-Z][A-Z])?"\s*,?)*' . $langcoun . '', - "$SRC_ROOT", "solenv", "bin/modules/installer/globals.pm", + "$SRC_ROOT", "solenv", "bin/modules/installer/languages.pm", ('^\s*@noMSLocaleLangs\s*=', '\)\s*$', '"' . $langcoun . '"')); # af 1252 1078 # Afrikaans diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 1f8816877a90..fd825c18668d 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -33,70 +33,6 @@ package installer::globals; BEGIN { - @noMSLocaleLangs = ( - "br", - "bs", - "dz", - "gu", - "km", - "nr", - "ns", - "nso", - "rw", - "ss", - "st", - "tg", - "ts", - "tn", - "ve", - "xh", - "zu", - "ne", - "bn", - "bn-BD", - "bn-IN", - "lo", - "cy", - "ku", - "as-IN", - "te-IN", - "ml-IN", - "mr-IN", - "ur-IN", - "ta-IN", - "or-IN", - "ti-ER", - "eo", - "ka", - "ga", - "uk", - "gd", - "my", - "mai", - "brx", - "dgo", - "kok", - "mni", - "ca-XV", - "sat", - "ug", - "om", - "si", - "or", - "oc", - "ml", - "as", - "ast", - "ht", - "jbo", - "fur", - "ny", - "so", - "kab", - "tk", - "ky-CN" - ); - $ziplistname = ""; $pathfilename = ""; $setupscriptname = ""; diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm index b7826eebe14f..db5ce8534060 100644 --- a/solenv/bin/modules/installer/languages.pm +++ b/solenv/bin/modules/installer/languages.pm @@ -138,9 +138,74 @@ sub get_all_languages_for_one_product my $furthercheck = 1; # For some languages (that are not supported by Windows, english needs to be added to the installation set - # Languages saved in "@installer::globals::noMSLocaleLangs" - if ( all_elements_of_array1_in_array2(\@languagearray, \@installer::globals::noMSLocaleLangs) ) + # FIXME The script i18npool/source/isolang/langid.pl greps this very + # source file to read this array. Be careful! + my @noMSLocaleLangs = ( + "br", + "bs", + "dz", + "gu", + "km", + "nr", + "ns", + "nso", + "rw", + "ss", + "st", + "tg", + "ts", + "tn", + "ve", + "xh", + "zu", + "ne", + "bn", + "bn-BD", + "bn-IN", + "lo", + "cy", + "ku", + "as-IN", + "te-IN", + "ml-IN", + "mr-IN", + "ur-IN", + "ta-IN", + "or-IN", + "ti-ER", + "eo", + "ka", + "ga", + "uk", + "gd", + "my", + "mai", + "brx", + "dgo", + "kok", + "mni", + "ca-XV", + "sat", + "ug", + "om", + "si", + "or", + "oc", + "ml", + "as", + "ast", + "ht", + "jbo", + "fur", + "ny", + "so", + "kab", + "tk", + "ky-CN", + ); + + if ( all_elements_of_array1_in_array2(\@languagearray, \@noMSLocaleLangs) ) { my $officestartlanguage = $languagearray[0]; unshift(@languagearray, "en-US"); # am Anfang einfgen! |