summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-01-09 15:09:58 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-01-10 12:40:08 +0000
commit9299707ce09077f10c49ec836e26f6197ed20a1a (patch)
tree84715babe559fd5e03fbf8995b76b34b5c97caab
parent147ce2ebeeac686d0a8e9e3d6d804aeba0fcbcdc (diff)
Always default-select English dictionary
It was discovered that on a Russian Windows, by default only Russian and German dictionaries would be installed, but no English dictionary. This is because since e2fac98819c00b4fb50f9de9d0f32d20092f3191 "fdo#53009: For msi installer, only default-select a subset of dictionaries" only those dictionaries mentioned in setup_native/source/packinfo/spellchecker_selection.txt were default-selected, but it apparently was a misunderstanding that spellcheker_selection.txt for many locales does not list "en" even though an English dictionary should always be default-installed. Quoting Andras Timar <atimar@suse.com>: "AFAIK en-US localization with English dictionaries is always installed in all 3 supported platforms by default. On Windows default install should always select en-US and English dictionaries. If it does not do so under certain circumstances, then it is a bug in my opinion. We removed en-US entry from the spellchecker selection file for this very reason. It would have only bloated Mac and Linux langpacks." So this fix simply makes sure that "en" is included in every line of the generated spellchecker_selection.hxx that is used by setup_native/source/win32/customactions/sellang/sellang.cxx to determine which dictionaries to select by default. Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8 (cherry picked from commit d8385c2cfc63b25414f37699faf0143ee9f5ded9) Reviewed-on: https://gerrit.libreoffice.org/1614 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--setup_native/source/packinfo/spellchecker_selection.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/setup_native/source/packinfo/spellchecker_selection.pl b/setup_native/source/packinfo/spellchecker_selection.pl
index b30a843e4acd..87f7cc204dcb 100644
--- a/setup_native/source/packinfo/spellchecker_selection.pl
+++ b/setup_native/source/packinfo/spellchecker_selection.pl
@@ -27,8 +27,9 @@ while (<>) {
@{$map{$lang}} = ();
} else {
@{$map{$lang}} = split(/,/, $dicts);
- $max = max($max, scalar(@{$map{$lang}}));
}
+ push(@{$map{$lang}}, ('en')) unless grep($_ eq 'en', @{$map{$lang}});
+ $max = max($max, scalar(@{$map{$lang}}));
}
++$max;