summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Maximilian Güntner <maximilian.guentner@gmail.com>2013-11-15 01:39:00 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-11-15 13:13:15 +0900
commit17fbb6b17f6a417f3178286225ce12cda49b36d9 (patch)
treefb6542c28fe37ab4ed5a12d2c3feffa3842f0704
parentc0a6c136f04b8dcca1fb148894148195a1a31d60 (diff)
downloadsubsurface-17fbb6b17f6a417f3178286225ce12cda49b36d9.tar.gz
Support translating UTF8 strings
Interpreting UTF8 encoded strings using tr() instead of trUtf8() and encoding the string back to utf8 again leads to serious encoding errors. Fixes #230 Signed-off-by: Maximilian Güntner <maximilian.guentner@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--gettextfromc.cpp2
-rw-r--r--gettextfromc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/gettextfromc.cpp b/gettextfromc.cpp
index c3b822ff5..fc11847fa 100644
--- a/gettextfromc.cpp
+++ b/gettextfromc.cpp
@@ -6,7 +6,7 @@ const char *gettextFromC::trGettext(const char *text)
{
QByteArray &result = translationCache[QByteArray(text)];
if (result.isEmpty())
- result = tr(text).toUtf8();
+ result = trUtf8(text).toUtf8();
return result.constData();
}
diff --git a/gettextfromc.h b/gettextfromc.h
index 6b5f7b184..c84d65f33 100644
--- a/gettextfromc.h
+++ b/gettextfromc.h
@@ -12,7 +12,7 @@ public:
static gettextFromC *instance();
const char *trGettext(const char *text);
void reset(void);
- QHash <QByteArray , QByteArray> translationCache;
+ QHash <QByteArray, QByteArray> translationCache;
};
#endif // GETTEXTFROMC_H