From c2af0f60d4c7fba83d1bd057451e2f0a1b6f2d60 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 13 Apr 2017 15:31:32 +0200
Subject: [PATCH] QXmlStream: resolve puzzle in translatable strings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-60159
Change-Id: I4cc83f50d38205eb2996d4122d487d07cc3d8677
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Reviewed-by: GunChleoc <fios@foramnagaidhlig.net>
---
 src/corelib/xml/qxmlstream.cpp | 37 ++++++++++++++--------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index 6dfa6744b8..f6ae3571ab 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -1886,32 +1886,25 @@ void QXmlStreamReaderPrivate::parseError()
             }
         }
 
-    error_message.clear ();
     if (nexpected && nexpected < nmax) {
-        bool first = true;
-
-        for (int s = 0; s < nexpected; ++s) {
-            if (first)
-                error_message += QXmlStream::tr ("Expected ");
-            else if (s == nexpected - 1)
-                error_message += QLatin1String (nexpected > 2 ? ", or " : " or ");
-            else
-                error_message += QLatin1String (", ");
-
-            first = false;
-            error_message += QLatin1String("\'");
-            error_message += QLatin1String (spell [expected[s]]);
-            error_message += QLatin1String("\'");
+        //: '<first option>'
+        QString exp_str = QXmlStream::tr("'%1'", "expected").arg(QLatin1String(spell[expected[0]]));
+        if (nexpected == 2) {
+            //: <first option>, '<second option>'
+            exp_str = QXmlStream::tr("%1 or '%2'", "expected").arg(exp_str, QLatin1String(spell[expected[1]]));
+        } else if (nexpected > 2) {
+            int s = 1;
+            for (; s < nexpected - 1; ++s) {
+                //: <options so far>, '<next option>'
+                exp_str = QXmlStream::tr("%1, '%2'", "expected").arg(exp_str, QLatin1String(spell[expected[s]]));
+            }
+            //: <options so far>, or '<final option>'
+            exp_str = QXmlStream::tr("%1, or '%2'", "expected").arg(exp_str, QLatin1String(spell[expected[s]]));
         }
-        error_message += QXmlStream::tr(", but got \'");
-        error_message += QLatin1String(spell [token]);
-        error_message += QLatin1String("\'");
+        error_message = QXmlStream::tr("Expected %1, but got '%2'.").arg(exp_str, QLatin1String(spell[token]));
     } else {
-        error_message += QXmlStream::tr("Unexpected \'");
-        error_message += QLatin1String(spell [token]);
-        error_message += QLatin1String("\'");
+        error_message = QXmlStream::tr("Unexpected '%1'.").arg(QLatin1String(spell[token]));
     }
-    error_message += QLatin1Char('.');
 
     raiseWellFormedError(error_message);
 }