[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - wsd/LOOLWSD.cpp

[Andras Timar (via logerrit)]

 wsd/LOOLWSD.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f5bb98f423d5159aa202d2e2be9571bd6c21c453
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu May 28 11:04:29 2020 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jun 16 22:37:35 2020 +0200

    use C.UTF-8 locale rather than en_US.UTF-8
    
    because en_US.UTF-8 is not present in minimal
    environments such as docker images
    
    Change-Id: I9edcb44df8a8f33117b2c5f1d2fa9e330bfc1770
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95018
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Signed-off-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96442

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 57b7c926f..e016bd01b 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3609,8 +3609,8 @@ int LOOLWSD::innerMain()
     initializeSSL();
 
     // Force a uniform UTF-8 locale for ourselves & our children.
-    ::setenv("LC_ALL", "en_US.UTF-8", 1);
-    setlocale(LC_ALL, "en_US.UTF-8");
+    ::setenv("LC_ALL", "C.UTF-8", 1);
+    setlocale(LC_ALL, "C.UTF-8");
 
 #if !MOBILEAPP
     // We use the same option set for both parent and child loolwsd,