Changed all strings displayed to end user to use qts localization system

2 files changed, 15 insertions, 12 deletions

diff --git a/logic/MinecraftProcess.cpp b/logic/MinecraftProcess.cpp
index c33d34a8..299f00be 100644
--- a/logic/MinecraftProcess.cpp
+++ b/logic/MinecraftProcess.cpp
@@ -120,9 +120,11 @@ void MinecraftProcess::finish(int code, ExitStatus status)
 	// TODO: Localization
 	
 	if (!killed)
-		emit log("Minecraft exited.");
+		//: Message displayed on instance exit
+		emit log(tr("Minecraft exited with exitcode %1.").arg(status));
 	else
-		emit log("Minecraft was killed by user.", MessageLevel::Error);
+		//: Message displayed after the instance exits due to kill request
+		emit log(tr("Minecraft was killed by user."), MessageLevel::Error);
 	
 	m_prepostlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(code));
 	
@@ -168,7 +170,8 @@ void MinecraftProcess::launch()
 	start(JavaPath, m_args);
 	if (!waitForStarted())
 	{
-		emit log("Could not launch minecraft!");
+		//: Error message displayed if instace can't start
+		emit log(tr("Could not launch minecraft!"));
 		return;
 		//TODO: error handling
 	}
diff --git a/logic/tasks/LoginTask.cpp b/logic/tasks/LoginTask.cpp
index ad9de7f5..859827bc 100644
--- a/logic/tasks/LoginTask.cpp
+++ b/logic/tasks/LoginTask.cpp
@@ -28,7 +28,7 @@ LoginTask::LoginTask( const UserInfo& uInfo, QObject* parent ) : Task(parent), u
 
 void LoginTask::executeTask()
 {
-	setStatus("Logging in...");
+	setStatus(tr("Logging in..."));
 	auto worker = MMC->qnam();
 	connect(worker, SIGNAL(finished(QNetworkReply*)), this, SLOT(processNetReply(QNetworkReply*)));
 	
@@ -76,36 +76,36 @@ void LoginTask::processNetReply(QNetworkReply *reply)
 				}
 				else
 				{
-					emitFailed("Failed to parse Minecraft version string.");
+					emitFailed(tr("Failed to parse Minecraft version string."));
 				}
 			}
 			else
 			{
 				if (responseStr.toLower() == "bad login")
-					emitFailed("Invalid username or password.");
+					emitFailed(tr("Invalid username or password."));
 				else if (responseStr.toLower() == "old version")
-					emitFailed("Launcher outdated, please update.");
+					emitFailed(tr("Launcher outdated, please update."));
 				else
-					emitFailed("Login failed: " + responseStr);
+					emitFailed(tr("Login failed: %1").arg(responseStr));
 			}
 		}
 		else if (responseCode == 503)
 		{
-			emitFailed("The login servers are currently unavailable. Check http://help.mojang.com/ for more info.");
+			emitFailed(tr("The login servers are currently unavailable. Check http://help.mojang.com/ for more info."));
 		}
 		else
 		{
-			emitFailed(QString("Login failed: Unknown HTTP error %1 occurred.").arg(QString::number(responseCode)));
+			emitFailed(tr("Login failed: Unknown HTTP error %1 occurred.").arg(QString::number(responseCode)));
 		}
 		break;
 	}
 		
 	case QNetworkReply::OperationCanceledError:
-		emitFailed("Login canceled.");
+		emitFailed(tr("Login canceled."));
 		break;
 		
 	default:
-		emitFailed("Login failed: " + reply->errorString());
+		emitFailed(tr("Login failed: %1").arg(reply->errorString()));
 		break;
 	}
 }