summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-09-19 19:28:01 +0300
committerTor Lillqvist <tml@collabora.com>2019-09-19 18:31:52 +0200
commitd15d3921f03a5ac0955b722e63be8ee965ca2294 (patch)
tree1ba81ef4b21719923437c0b56374e0c2105f2575 /unotools
parentee0fcc88c9c56756f66e9456ac6d17f611103f8c (diff)
We need the de-CH 'ß' -> 'ss' code for iOS in another place too
In this branch there is both get() and nget(). Change-Id: Ib30ce719c466ce1da27892d2f284573937ca806e Reviewed-on: https://gerrit.libreoffice.org/79224 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/i18n/resmgr.cxx10
1 files changed, 9 insertions, 1 deletions
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index 7649e94abe4c..ca384cf42a72 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -218,7 +218,15 @@ namespace Translate
//otherwise translate it
const std::string ret = boost::locale::pgettext(sContext.getStr(), pId, loc);
- return ExpandVariables(createFromUtf8(ret.data(), ret.size()));
+ OUString result(ExpandVariables(createFromUtf8(ret.data(), ret.size())));
+
+#ifdef IOS
+ // If it is de-CH, change sharp s to double s.
+ if (std::use_facet<boost::locale::info>(loc).country() == "CH" &&
+ std::use_facet<boost::locale::info>(loc).language() == "de")
+ result = result.replaceAll(OUString::fromUtf8("\xC3\x9F"), "ss");
+#endif
+ return result;
}
OUString nget(const char* pContextAndIds, int n, const std::locale &loc)