[PATCH 1/2] Support translating UTF8 strings

Maximilian Güntner maximilian.guentner at gmail.com
Thu Nov 14 10:47:29 UTC 2013


Interpreting UTF8 encoded strings using tr() instead of trUtf8()
and encoding the string back to utf8 again leads to serious encoding
errors.

Signed-off-by: Maximilian Güntner <maximilian.guentner at gmail.com>
---
 gettextfromc.cpp | 2 +-
 gettextfromc.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gettextfromc.cpp b/gettextfromc.cpp
index c3b822f..fc11847 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 6b5f7b1..c84d65f 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
-- 
1.8.4.2



More information about the subsurface mailing list