From 524fc5b6ecf9e5f193db1173164ae23c6e6702b1 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Thu, 8 Apr 2021 18:46:22 +0100
Subject: [PATCH] NOISSUE Fix string formatting issues

This allows translations to have more control over the output :)
---
 .../modplatform/atlauncher/ATLPackInstallTask.cpp    | 12 ++++++------
 .../modplatform/modpacksch/FTBPackInstallTask.cpp    |  2 +-
 libraries/ganalytics/src/ganalytics_worker.cpp       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp b/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp
index 25c6d58d..12ceaccd 100644
--- a/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -73,13 +73,13 @@ void PackInstallTask::onDownloadSucceeded()
     auto vlist = ENV.metadataIndex()->get("net.minecraft");
     if(!vlist)
     {
-        emitFailed(tr("Failed to get local metadata index for ") + "net.minecraft");
+        emitFailed(tr("Failed to get local metadata index for %1").arg("net.minecraft"));
         return;
     }
 
     auto ver = vlist->getVersion(m_version.minecraft);
     if (!ver) {
-        emitFailed(tr("Failed to get local metadata index for ") + "net.minecraft" + " " + m_version.minecraft);
+        emitFailed(tr("Failed to get local metadata index for '%1' v%2").arg("net.minecraft").arg(m_version.minecraft));
         return;
     }
     ver->load(Net::Mode::Online);
@@ -141,7 +141,7 @@ QString PackInstallTask::getDirForModType(ModType type, QString raw)
             qWarning() << "Unsupported mod type: " + raw;
             return Q_NULLPTR;
         case ModType::Unknown:
-            emitFailed(tr("Unknown mod type: ") + raw);
+            emitFailed(tr("Unknown mod type: %1").arg(raw));
             return Q_NULLPTR;
     }
 
@@ -271,7 +271,7 @@ bool PackInstallTask::createLibrariesComponent(QString instanceRoot, std::shared
                 break;
             case DownloadType::Browser:
             case DownloadType::Unknown:
-                emitFailed(tr("Unknown or unsupported download type: ") + lib.download_raw);
+                emitFailed(tr("Unknown or unsupported download type: %1").arg(lib.download_raw));
                 return false;
         }
 
@@ -437,13 +437,13 @@ void PackInstallTask::downloadMods()
                 url = BuildConfig.ATL_DOWNLOAD_SERVER_URL + mod.url;
                 break;
             case DownloadType::Browser:
-                emitFailed(tr("Unsupported download type: ") + mod.download_raw);
+                emitFailed(tr("Unsupported download type: %1").arg(mod.download_raw));
                 return;
             case DownloadType::Direct:
                 url = mod.url;
                 break;
             case DownloadType::Unknown:
-                emitFailed(tr("Unknown download type: ") + mod.download_raw);
+                emitFailed(tr("Unknown download type: %1").arg(mod.download_raw));
                 return;
         }
 
diff --git a/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp b/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp
index 59546b00..068e3592 100644
--- a/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp
+++ b/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp
@@ -35,7 +35,7 @@ void PackInstallTask::executeTask()
     }
 
     if(!found) {
-        emitFailed("failed to find pack version " + m_version_name);
+        emitFailed(tr("Failed to find pack version %1").arg(m_version_name));
         return;
     }
 
diff --git a/libraries/ganalytics/src/ganalytics_worker.cpp b/libraries/ganalytics/src/ganalytics_worker.cpp
index 5980d3bd..b0ae75a4 100644
--- a/libraries/ganalytics/src/ganalytics_worker.cpp
+++ b/libraries/ganalytics/src/ganalytics_worker.cpp
@@ -237,7 +237,7 @@ void GAnalyticsWorker::postMessageFinished()
     int httpStausCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
     if (httpStausCode < 200 || httpStausCode > 299)
     {
-        logMessage(GAnalytics::Error, QString("Error posting message: %s").arg(reply->errorString()));
+        logMessage(GAnalytics::Error, QString("Error posting message: %1").arg(reply->errorString()));
 
         // An error ocurred. Try sending later.
         m_timer.start();