[rkward-cvs] [rkward/releases/0.6.3] rkward/misc: Fix some message lookup failures, due to insufficient normalization of markup.

[Thomas F. <tho...@ru...>]

Git commit adf61faa15d70b445e70d08e7e5f6f6fcafd118f by Thomas Friedrichsmeier.
Committed on 05/02/2015 at 20:16.
Pushed by tfry into branch 'releases/0.6.3'.

Fix some message lookup failures, due to insufficient normalization of markup.

M  +5    -0    rkward/misc/xmlhelper.cpp

http://commits.kde.org/rkward/adf61faa15d70b445e70d08e7e5f6f6fcafd118f

diff --git a/rkward/misc/xmlhelper.cpp b/rkward/misc/xmlhelper.cpp
index bb60f80..d6fd815 100644
--- a/rkward/misc/xmlhelper.cpp
+++ b/rkward/misc/xmlhelper.cpp
@@ -344,6 +344,11 @@ QString XMLHelper::i18nElementText (const QDomElement &element, bool with_paragr
 		QString para = paras[i].simplified ();
 		if (!para.isEmpty ()) {
 			if (!ret.isEmpty ()) ret.append ("\n");
+			// Oh, crap. Fix up after some differences between python message extraction and qt's.
+			para.replace ("<li> <", "<li><");
+			para.replace ("br> <", "br><");
+			para.replace ("> </li>", "></li>");
+			para.replace ("&amp;", "&");
 			QString text = context.isNull () ? catalog->translate (para) : catalog->translate (context, para);
 			if (with_paragraphs) ret += "<p>" + text + "</p>";
 			else ret += text;