[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd.xml.in wsd/LOOLWSD.cpp

[Andras Timar]

 loolwsd.xml.in  |    2 +-
 wsd/LOOLWSD.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9e386777305670b3abe8f2234802dd11a72c6909
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Feb 16 11:07:21 2018 +0100

    Allow preload of nl dictionary by default
    
    Change-Id: Id6410fa4febdd778f511e0bdcc4324ad0c2fdf43
    (cherry picked from commit 0b382f879b86cfe377cd41e4a8ac53afbfcc4e5d)

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 3376bcaa..c1e7f7cb 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -3,7 +3,7 @@
     <!-- Note: 'default' attributes are used to document a setting's default value as well as to use as fallback. -->
     <!-- Note: When adding a new entry, a default must be set in WSD in case the entry is missing upon deployment. -->
 
-    <allowed_languages desc="List of supported languages on this instance." default="de_DE en_GB en_US es_ES fr_FR it pt_BR pt_PT ru">de_DE en_GB en_US es_ES fr_FR it pt_BR pt_PT ru</allowed_languages>
+    <allowed_languages desc="List of supported languages on this instance." default="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru">de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</allowed_languages>
 
     <tile_cache_path desc="Path to a directory where to keep the tile cache." type="path" relative="false" default="@LOOLWSD_CACHEDIR@"></tile_cache_path>
     <sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="true" default="systemplate"></sys_template_path>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 2b10d469..7f2b3d49 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -626,7 +626,7 @@ void LOOLWSD::initialize(Application& self)
 
     // Add default values of new entries here.
     static const std::map<std::string, std::string> DefAppConfig
-        = { { "allowed_languages", "de_DE en_GB en_US es_ES fr_FR it pt_BR pt_PT ru" },
+        = { { "allowed_languages", "de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru" },
             { "tile_cache_path", LOOLWSD_CACHEDIR },
             { "tile_cache_persistent", "true" },
             { "sys_template_path", "systemplate" },