mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

installer: Make @noMSLocaleLangs non-global.

Browse Source 
Change-Id: Iae7afa53966a4f5fe3b09ce75dcefc78fd75b279
This commit is contained in:
Tim Retout
2012-09-01 10:58:25 +01:00
parent 4e38a1c870
commit a3f8156e0d
3 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
i18npool/source/isolang/langid.pl
View File

@@ -30,7 +30,7 @@ sub Usage()
"\n", "\n",
"langid - a hackish utility to lookup lang.h language defines and LangIDs,\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", "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", "msi-encodinglist.txt\n\n",
"Usage: $0 [--single] {language string} | {LangID} | {primarylanguage sublanguage} | {language-country}\n\n", "Usage: $0 [--single] {language string} | {LangID} | {primarylanguage sublanguage} | {language-country}\n\n",
@@ -400,7 +400,7 @@ sub main()
# @noMSLocaleLangs = ( "br", "bs", ... ) # @noMSLocaleLangs = ( "br", "bs", ... )
grepFile( grepFile(
'^\s*@noMSLocaleLangs\s*=\s*\(\s*(\s*"([a-z]{2,3})(-[A-Z][A-Z])?"\s*,?)*' . $langcoun . '', '^\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 . '"')); ('^\s*@noMSLocaleLangs\s*=', '\)\s*$', '"' . $langcoun . '"'));
# af 1252 1078 # Afrikaans # af 1252 1078 # Afrikaans

64
solenv/bin/modules/installer/globals.pm
View File

@@ -33,70 +33,6 @@ package installer::globals;
BEGIN 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 = ""; $ziplistname = "";
$pathfilename = ""; $pathfilename = "";
$setupscriptname = ""; $setupscriptname = "";

69
solenv/bin/modules/installer/languages.pm
View File

@@ -138,9 +138,74 @@ sub get_all_languages_for_one_product
my $furthercheck = 1; my $furthercheck = 1;
# For some languages (that are not supported by Windows, english needs to be added to the installation set # 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]; my $officestartlanguage = $languagearray[0];
unshift(@languagearray, "en-US"); # am Anfang einf<6E>gen! unshift(@languagearray, "en-US"); # am Anfang einf<6E>gen!