[PATCH] Change in core[libreoffice-4-0]: Always default-select English dictionary

[Stephan Bergmann (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1614

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/1614/1

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 at 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)
---
M setup_native/source/packinfo/spellchecker_selection.pl
1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/setup_native/source/packinfo/spellchecker_selection.pl b/setup_native/source/packinfo/spellchecker_selection.pl
index b30a843..87f7cc2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.pl
+++ b/setup_native/source/packinfo/spellchecker_selection.pl
@@ -27,8 +27,9 @@
         @{$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;

-- 
To view, visit https://gerrit.libreoffice.org/1614
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann <sbergman at redhat.com>