[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - unotools/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit dc8db8308840516115a3f7cc9397a5c37bf99862
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 17 20:14:17 2020 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Mar 18 14:01:01 2020 +0100

    tdf#131069 always produce utf-8 from gettext
    
    Change-Id: I311e647f08b4d541825e7790d971b98b5b5bfe40
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90631
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index 47069489aa41..786c83df2e7b 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -130,7 +130,10 @@ namespace Translate
         OString sPath(OUStringToOString(path, osl_getThreadTextEncoding()));
         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);