[Libreoffice-commits] core.git: unotools/source

[Caolán McNamara (via logerrit)]

 unotools/source/i18n/resmgr.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 49d1325ecbcbad32abd4cc55d946a720f99801f4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 17 20:14:17 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Mar 18 12:40:43 2020 +0100

    tdf#131069 always produce utf-8 from gettext
    
    Change-Id: I311e647f08b4d541825e7790d971b98b5b5bfe40
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90668
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index df5283d71292..a1d74ec1b7cd 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -138,7 +138,10 @@ namespace Translate
 #endif
         gen.add_messages_path(sPath.getStr());
 #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID
+        // allow gettext to find these .mo files e.g. so gtk dialogs can use them
         bindtextdomain(pPrefixName, sPath.getStr());
+        // tdf#131069 gtk, and anything sane, always wants utf-8 strings as output
+        bind_textdomain_codeset(pPrefixName, "UTF-8");
 #endif
         gen.add_messages_domain(pPrefixName);