unotools/source/i18n/resmgr.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit beb758215b898dcb2605c4d5bebbd736aa1e493d
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Wed Dec 18 23:07:11 2019 +0100
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Wed Jan 1 23:43:24 2020 +0100
android: Use correct path for the .mo resource files.
They are read by boost::locale, so we cannot have them as normal assets,
instead we have to have them in asset's 'unpack', so that they are
unpacked to the filesystem and can be read as normal files.
Change-Id: I5e902ee4b5294d1f693f51993b8bc2069f1c835a
Reviewed-on: https://gerrit.libreoffice.org/85442
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85458
Tested-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index 4e899aa9ea26..df5283d71292 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -51,6 +51,10 @@
#include <unordered_map>
#include <memory>
+#ifdef ANDROID
+#include <osl/detail/android-bootstrap.h>
+#endif
+
#if defined(_WIN32) && defined(DBG_UTIL)
#include <o3tl/char16_t2wchar_t.hxx>
#include <prewin.h>
@@ -123,11 +127,15 @@ namespace Translate
boost::locale::generator gen;
gen.characters(boost::locale::char_facet);
gen.categories(boost::locale::message_facet |
boost::locale::information_facet);
+#if defined(ANDROID)
+ OString sPath(OString(lo_get_app_data_dir()) + "/program/resource");
+#else
OUString uri("$BRAND_BASE_DIR/$BRAND_SHARE_RESOURCE_SUBDIR/");
rtl::Bootstrap::expandMacros(uri);
OUString path;
osl::File::getSystemPathFromFileURL(uri, path);
OString sPath(OUStringToOString(path, osl_getThreadTextEncoding()));
+#endif
gen.add_messages_path(sPath.getStr());
#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID
bindtextdomain(pPrefixName, sPath.getStr());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
