Fix describeCertificateHtml, mk. 2

Author: Fabian Müller

src/gui/tlserrordialog.cpp

@@ -72,33 +72,44 @@ QString TlsErrorDialog::describeCertificateHtml(const QSslCertificate &certifica
         }
     };
 
-    auto subjectInfo = QStringList()
-        << tr("Organization: %1").arg(escapeValueOrNotSpecified(certificate.subjectInfo(QSslCertificate::Organization)))
-        << tr("Unit: %1").arg(escapeValueOrNotSpecified(certificate.subjectInfo(QSslCertificate::OrganizationalUnitName)))
-        << tr("Country: %1").arg(escapeValueOrNotSpecified(certificate.subjectInfo(QSslCertificate::CountryName)));
-
-    auto issuerInfo = QStringList()
-        << tr("Organization: %1").arg(escapeValueOrNotSpecified(certificate.issuerInfo(QSslCertificate::Organization)))
-        << tr("Unit: %1").arg(escapeValueOrNotSpecified(certificate.issuerInfo(QSslCertificate::OrganizationalUnitName)))
-        << tr("Country: %1").arg(escapeValueOrNotSpecified(certificate.issuerInfo(QSslCertificate::CountryName)));
-
-    QString msg = QStringLiteral("<div id=\"cert\">")
-        + QLatin1String("<h3>") + tr("with Certificate %1").arg(Utility::escape(certificate.subjectInfo(QSslCertificate::CommonName).join(", "))) + QStringLiteral("</h3>")
-        + QStringLiteral("<div id=\"ccert\">")
-        + QStringLiteral("<p>") + subjectInfo.join(QStringLiteral("<br/>")) + QStringLiteral("</p>")
-        + QStringLiteral("<p>")
-        + tr("Fingerprint (MD5): <tt>%1</tt>").arg(formatFingerprint(QCryptographicHash::Md5)) + QStringLiteral("<br/>")
-        + tr("Fingerprint (SHA1): <tt>%1</tt>").arg(formatFingerprint(QCryptographicHash::Sha1)) + QStringLiteral("<br/>")
-        + tr("Fingerprint (SHA256): <tt>%1</tt>").arg(formatFingerprint(QCryptographicHash::Sha256)) + QStringLiteral("<br/>")
-        + QStringLiteral("<br/>")
-        + tr("Effective Date: %1").arg(certificate.effectiveDate().toString()) + QStringLiteral("<br/>")
-        + tr("Expiration Date: %1").arg(certificate.expiryDate().toString()) + QStringLiteral("</p>")
-        + QStringLiteral("</div>")
-        + QStringLiteral("<h3>") + tr("Issuer: %1").arg(Utility::escape(certificate.issuerInfo(QSslCertificate::CommonName).join(", "))) + QStringLiteral("</h3>")
-        + QStringLiteral("<div id=\"issuer\">")
-        + QStringLiteral("<p>") + issuerInfo.join(QStringLiteral("<br/>")) + QStringLiteral("</p>")
-        + QStringLiteral("</div>")
-        + QStringLiteral("</div>");
+    QString msg = QStringLiteral(
+        "<div id=\"cert\">"
+        "<h3>with Certificate %1</h3>"
+        "<div id=\"ccert\">"
+        "<p>"
+        "Organization: %2<br/>"
+        "Unit: %3<br/>"
+        "Country: %4"
+        "</p>"
+        "<p>"
+        "Fingerprint (MD5): <tt>%5</tt><br/>"
+        "Fingerprint (SHA1): <tt>%6</tt><br/>"
+        "<br/>"
+        "Effective Date: %7"
+        "Expiration Date: %8"
+        "</div>"
+        "<h3>Issuer: %9</h3>"
+        "<div id=\"issuer\">"
+        "<p>"
+        "Organization: %10<br/>"
+        "Unit: %11<br/>"
+        "Country: %12"
+        "</p>"
+        "</div>"
+        "</div>")
+                      .arg(
+                          formatInfo(certificate.subjectInfo(QSslCertificate::CommonName)),
+                          escapeValueOrNotSpecified(certificate.subjectInfo(QSslCertificate::Organization)),
+                          escapeValueOrNotSpecified(certificate.subjectInfo(QSslCertificate::OrganizationalUnitName)),
+                          escapeValueOrNotSpecified(certificate.subjectInfo(QSslCertificate::CountryName)),
+                          formatFingerprint(QCryptographicHash::Md5),
+                          formatFingerprint(QCryptographicHash::Sha1),
+                          certificate.effectiveDate().toString(),
+                          certificate.expiryDate().toString(),
+                          formatInfo(certificate.issuerInfo(QSslCertificate::CommonName)),
+                          escapeValueOrNotSpecified(certificate.issuerInfo(QSslCertificate::Organization)),
+                          escapeValueOrNotSpecified(certificate.issuerInfo(QSslCertificate::OrganizationalUnitName)),
+                          escapeValueOrNotSpecified(certificate.issuerInfo(QSslCertificate::CountryName)));
 
     return msg;
 }