Merge pull request #3875 from jamierocks/feature/gh-3033

GH-3033 Add filtering for version components

4 files changed, 21 insertions, 23 deletions

diff --git a/api/logic/minecraft/launch/CreateGameFolders.cpp b/api/logic/minecraft/launch/CreateGameFolders.cpp
index 415b7e23..4081e72e 100644
--- a/api/logic/minecraft/launch/CreateGameFolders.cpp
+++ b/api/logic/minecraft/launch/CreateGameFolders.cpp
@@ -15,7 +15,7 @@ void CreateGameFolders::executeTask()
     if(!FS::ensureFolderPathExists(minecraftInstance->gameRoot()))
     {
         emit logLine("Couldn't create the main game folder", MessageLevel::Error);
-        emitFailed("Couldn't create the main game folder");
+        emitFailed(tr("Couldn't create the main game folder"));
         return;
     }
 
diff --git a/api/logic/minecraft/launch/DirectJavaLaunch.cpp b/api/logic/minecraft/launch/DirectJavaLaunch.cpp
index cf4564b6..2110384f 100644
--- a/api/logic/minecraft/launch/DirectJavaLaunch.cpp
+++ b/api/logic/minecraft/launch/DirectJavaLaunch.cpp
@@ -66,9 +66,9 @@ void DirectJavaLaunch::executeTask()
         auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
         if (realWrapperCommand.isEmpty())
         {
-            QString reason = tr("The wrapper command \"%1\" couldn't be found.").arg(wrapperCommand);
-            emit logLine(reason, MessageLevel::Fatal);
-            emitFailed(reason);
+            const char *reason = QT_TR_NOOP("The wrapper command \"%1\" couldn't be found.");
+            emit logLine(QString(reason).arg(wrapperCommand), MessageLevel::Fatal);
+            emitFailed(tr(reason).arg(wrapperCommand));
             return;
         }
         emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n", MessageLevel::MultiMC);
@@ -87,18 +87,17 @@ void DirectJavaLaunch::on_state(LoggedProcess::State state)
     {
         case LoggedProcess::FailedToStart:
         {
-            //: Error message displayed if instace can't start
-            QString reason = tr("Could not launch minecraft!");
+            //: Error message displayed if instance can't start
+            const char *reason = QT_TR_NOOP("Could not launch minecraft!");
             emit logLine(reason, MessageLevel::Fatal);
-            emitFailed(reason);
+            emitFailed(tr(reason));
             return;
         }
         case LoggedProcess::Aborted:
         case LoggedProcess::Crashed:
-
         {
             m_parent->setPid(-1);
-            emitFailed("Game crashed.");
+            emitFailed(tr("Game crashed."));
             return;
         }
         case LoggedProcess::Finished:
@@ -108,7 +107,7 @@ void DirectJavaLaunch::on_state(LoggedProcess::State state)
             auto exitCode = m_process.exitCode();
             if(exitCode != 0)
             {
-                emitFailed("Game crashed.");
+                emitFailed(tr("Game crashed."));
                 return;
             }
             //FIXME: make this work again
@@ -118,7 +117,7 @@ void DirectJavaLaunch::on_state(LoggedProcess::State state)
             break;
         }
         case LoggedProcess::Running:
-            emit logLine(tr("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::MultiMC);
+            emit logLine(QString("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::MultiMC);
             m_parent->setPid(m_process.processId());
             m_parent->instance()->setLastLaunch();
             break;
diff --git a/api/logic/minecraft/launch/ExtractNatives.cpp b/api/logic/minecraft/launch/ExtractNatives.cpp
index d41cb8fd..d57499aa 100644
--- a/api/logic/minecraft/launch/ExtractNatives.cpp
+++ b/api/logic/minecraft/launch/ExtractNatives.cpp
@@ -94,9 +94,9 @@ void ExtractNatives::executeTask()
     {
         if(!unzipNatives(source, outputPath, jniHackEnabled, nativeOpenAL, nativeGLFW))
         {
-            auto reason = tr("Couldn't extract native jar '%1' to destination '%2'").arg(source, outputPath);
-            emit logLine(reason, MessageLevel::Fatal);
-            emitFailed(reason);
+            const char *reason = QT_TR_NOOP("Couldn't extract native jar '%1' to destination '%2'");
+            emit logLine(QString(reason).arg(source, outputPath), MessageLevel::Fatal);
+            emitFailed(tr(reason).arg(source, outputPath));
         }
     }
     emitSucceeded();
diff --git a/api/logic/minecraft/launch/LauncherPartLaunch.cpp b/api/logic/minecraft/launch/LauncherPartLaunch.cpp
index ab3b6d10..ee469770 100644
--- a/api/logic/minecraft/launch/LauncherPartLaunch.cpp
+++ b/api/logic/minecraft/launch/LauncherPartLaunch.cpp
@@ -118,9 +118,9 @@ void LauncherPartLaunch::executeTask()
         auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
         if (realWrapperCommand.isEmpty())
         {
-            QString reason = tr("The wrapper command \"%1\" couldn't be found.").arg(wrapperCommand);
-            emit logLine(reason, MessageLevel::Fatal);
-            emitFailed(reason);
+            const char *reason = QT_TR_NOOP("The wrapper command \"%1\" couldn't be found.");
+            emit logLine(QString(reason).arg(wrapperCommand), MessageLevel::Fatal);
+            emitFailed(tr(reason).arg(wrapperCommand));
             return;
         }
         emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n", MessageLevel::MultiMC);
@@ -140,17 +140,16 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
         case LoggedProcess::FailedToStart:
         {
             //: Error message displayed if instace can't start
-            QString reason = tr("Could not launch minecraft!");
+            const char *reason = QT_TR_NOOP("Could not launch minecraft!");
             emit logLine(reason, MessageLevel::Fatal);
-            emitFailed(reason);
+            emitFailed(tr(reason));
             return;
         }
         case LoggedProcess::Aborted:
         case LoggedProcess::Crashed:
-
         {
             m_parent->setPid(-1);
-            emitFailed("Game crashed.");
+            emitFailed(tr("Game crashed."));
             return;
         }
         case LoggedProcess::Finished:
@@ -160,7 +159,7 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
             auto exitCode = m_process.exitCode();
             if(exitCode != 0)
             {
-                emitFailed("Game crashed.");
+                emitFailed(tr("Game crashed."));
                 return;
             }
             //FIXME: make this work again
@@ -170,7 +169,7 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
             break;
         }
         case LoggedProcess::Running:
-            emit logLine(tr("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::MultiMC);
+            emit logLine(QString("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::MultiMC);
             m_parent->setPid(m_process.processId());
             m_parent->instance()->setLastLaunch();
             // send the launch script to the launcher part