Split error message about unsupported WWW-Authenticate challenges

Passing the count is wrong unless %n is actually used.

Amends da30f70fea239f723f1d36b076bb3f5860f50ed9.

Task-number: QTBUG-92858
Pick-to: 6.6
Change-Id: I3aed91dde4b8e9321b9408d02d50eb31a93439ba
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 12 insertions, 5 deletions

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 401e756..83455d9 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -967,6 +967,17 @@ qint64 QWebSocketPrivate::writeFrame(const QByteArray &frame)
     return written;
 }
 
+static QString msgUnsupportedAuthenticateChallenges(qsizetype count)
+{
+    // Keep the error on a single line so it can easily be searched for:
+    //: 'WWW-Authenticate' is the HTTP header.
+    return count == 1
+        ? QWebSocket::tr("QWebSocketPrivate::processHandshake: "
+                         "Unsupported WWW-Authenticate challenge encountered.")
+        : QWebSocket::tr("QWebSocketPrivate::processHandshake: "
+                         "Unsupported WWW-Authenticate challenges encountered.");
+}
+
 //called on the client for a server handshake response
 /*!
     \internal
@@ -1103,11 +1114,7 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
         if (isSupported)
             priv->parseHttpResponse(parser.headers(), /*isProxy=*/false, m_request.url().host());
         if (!isSupported || priv->method == QAuthenticatorPrivate::None) {
-            // Keep the error on a single line so it can easily be searched for:
-            errorDescription = QWebSocket::tr(
-                    "QWebSocketPrivate::processHandshake: "
-                    "Unsupported WWW-Authenticate challenge(s) encountered.",
-                    "'WWW-Authenticate' is the HTTP header.", int(challenges.size()));
+            errorDescription = msgUnsupportedAuthenticateChallenges(challenges.size());
             break;
         }