Mercurial > clickerconvert
changeset 86:08cca723e37d
Move pre into html style to keep it out of xlsx
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Wed, 05 Oct 2016 14:59:20 +0200 |
| parents | 12b160bc2c2e |
| children | cc0ce6d26c9f |
| files | src/converter.cpp src/l10n/main_de_DE.ts |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/converter.cpp Wed Oct 05 14:58:49 2016 +0200 +++ b/src/converter.cpp Wed Oct 05 14:59:20 2016 +0200 @@ -73,7 +73,7 @@ "><hr/>%1<hr/></td></tr>"); mAnswerChoiceStyle= QStringLiteral("<tr><td colspan='3' style='text-align: left; font-size: 11pt;'>Answer</td></tr>"); mChoiceTextStyle= QStringLiteral("<tr><td align='right' style='vertical-align: middle; font-size:11pt;'>%1</td>"); - mChoiceVotesStyle = QStringLiteral("<td align='left' style='vertical-align: middle; font-size:10pt;'>%1</td></tr>"); + mChoiceVotesStyle = QStringLiteral("<td align='left' style='vertical-align: middle; font-size:10pt;'><pre>%1</pre></td></tr>"); mAnswerTextStyle = QStringLiteral("<tr><td colspan='3' style='font-weight: bold;vertical-algin: middle;" "font-size:11pt;'>Answer<hr/></td></tr>"); mFreeTextStyle = QStringLiteral("<tr><td colspan='3'; style='font-size:11pt;'>%1<hr/></td></tr>"); @@ -337,7 +337,7 @@ makeBar(html, percent, doc); xlsx.write(row, 2, percent == 0 ? QVariant() : percent); const QString numStr = choiceMatch.captured("num"); - const QString numVotesString = QString("<pre>%1% | %2 Number of votes</pre> "). + const QString numVotesString = QString("%1% | %2 Number of votes"). arg(percentStr.isEmpty() ? QStringLiteral("0") : percentStr, 8). arg(numStr.isEmpty() ? QStringLiteral("0") : numStr, 3); html << mChoiceVotesStyle.arg(numVotesString);
--- a/src/l10n/main_de_DE.ts Wed Oct 05 14:58:49 2016 +0200 +++ b/src/l10n/main_de_DE.ts Wed Oct 05 14:59:20 2016 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="de_DE"> +<TS version="2.1" language="de_DE"> <context> <name></name> <message> @@ -138,7 +138,7 @@ </message> <message> <source>Output format (default xlsx).</source> - <translation>Ausgabeformat (standard xlsx)</translation> + <translation type="vanished">Ausgabeformat (standard xlsx)</translation> </message> <message> <location filename="../cconvert_options.h" line="23"/>