From a3a5afe1198266e7c4a1bc6dd8f65062426b24c4 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sun, 2 Nov 2014 19:24:28 +0100 Subject: [PATCH] Fix #231: Enable translation for more strings --- gui/dialogs/AboutDialog.cpp | 6 +++--- logic/BaseVersionList.cpp | 8 ++++---- logic/LwjglVersionList.cpp | 4 ++-- logic/ModList.cpp | 10 +++++----- logic/auth/MojangAccountList.cpp | 6 +++--- logic/forge/ForgeVersionList.cpp | 12 ++++++------ logic/java/JavaVersionList.cpp | 12 ++++++------ 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gui/dialogs/AboutDialog.cpp b/gui/dialogs/AboutDialog.cpp index 3d8848c3..002d5cf6 100644 --- a/gui/dialogs/AboutDialog.cpp +++ b/gui/dialogs/AboutDialog.cpp @@ -26,7 +26,7 @@ // This is a hack, but I can't think of a better way to do this easily without screwing with QTextDocument... QString getCreditsHtml(QStringList patrons) { - QString creditsHtml = + QString creditsHtml = QObject::tr( "" "" "" @@ -56,9 +56,9 @@ QString getCreditsHtml(QStringList patrons) "%1" "" "" - ""; + ""); if (patrons.isEmpty()) - return creditsHtml.arg("

Loading...

"); + return creditsHtml.arg(QObject::tr("

Loading...

")); else { QString patronsStr; diff --git a/logic/BaseVersionList.cpp b/logic/BaseVersionList.cpp index b34750b5..f74966ce 100644 --- a/logic/BaseVersionList.cpp +++ b/logic/BaseVersionList.cpp @@ -82,10 +82,10 @@ QVariant BaseVersionList::headerData(int section, Qt::Orientation orientation, i switch (section) { case NameColumn: - return "Name"; + return tr("Name"); case TypeColumn: - return "Type"; + return tr("Type"); default: return QVariant(); @@ -95,10 +95,10 @@ QVariant BaseVersionList::headerData(int section, Qt::Orientation orientation, i switch (section) { case NameColumn: - return "The name of the version."; + return tr("The name of the version."); case TypeColumn: - return "The version's type."; + return tr("The version's type."); default: return QVariant(); diff --git a/logic/LwjglVersionList.cpp b/logic/LwjglVersionList.cpp index 84aaf03d..11c1e0aa 100644 --- a/logic/LwjglVersionList.cpp +++ b/logic/LwjglVersionList.cpp @@ -57,10 +57,10 @@ QVariant LWJGLVersionList::headerData(int section, Qt::Orientation orientation, switch (role) { case Qt::DisplayRole: - return "Version"; + return tr("Version"); case Qt::ToolTipRole: - return "LWJGL version name."; + return tr("LWJGL version name."); default: return QVariant(); diff --git a/logic/ModList.cpp b/logic/ModList.cpp index a1605506..9f2fc742 100644 --- a/logic/ModList.cpp +++ b/logic/ModList.cpp @@ -467,9 +467,9 @@ QVariant ModList::headerData(int section, Qt::Orientation orientation, int role) case ActiveColumn: return QString(); case NameColumn: - return QString("Name"); + return tr("Name"); case VersionColumn: - return QString("Version"); + return tr("Version"); default: return QVariant(); } @@ -478,11 +478,11 @@ QVariant ModList::headerData(int section, Qt::Orientation orientation, int role) switch (section) { case ActiveColumn: - return "Is the mod enabled?"; + return tr("Is the mod enabled?"); case NameColumn: - return "The name of the mod."; + return tr("The name of the mod."); case VersionColumn: - return "The version of the mod."; + return tr("The version of the mod."); default: return QVariant(); } diff --git a/logic/auth/MojangAccountList.cpp b/logic/auth/MojangAccountList.cpp index e3621dac..f667ef8c 100644 --- a/logic/auth/MojangAccountList.cpp +++ b/logic/auth/MojangAccountList.cpp @@ -183,10 +183,10 @@ QVariant MojangAccountList::headerData(int section, Qt::Orientation orientation, switch (section) { case ActiveColumn: - return "Active?"; + return tr("Active?"); case NameColumn: - return "Name"; + return tr("Name"); default: return QVariant(); @@ -196,7 +196,7 @@ QVariant MojangAccountList::headerData(int section, Qt::Orientation orientation, switch (section) { case NameColumn: - return "The name of the version."; + return tr("The name of the version."); default: return QVariant(); diff --git a/logic/forge/ForgeVersionList.cpp b/logic/forge/ForgeVersionList.cpp index ee7c63e3..196ed31e 100644 --- a/logic/forge/ForgeVersionList.cpp +++ b/logic/forge/ForgeVersionList.cpp @@ -99,13 +99,13 @@ QVariant ForgeVersionList::headerData(int section, Qt::Orientation orientation, switch (section) { case 0: - return "Version"; + return tr("Version"); case 1: - return "Minecraft"; + return tr("Minecraft"); case 2: - return "Type"; + return tr("Type"); default: return QVariant(); @@ -115,13 +115,13 @@ QVariant ForgeVersionList::headerData(int section, Qt::Orientation orientation, switch (section) { case 0: - return "The name of the version."; + return tr("The name of the version."); case 1: - return "Minecraft version"; + return tr("Minecraft version"); case 2: - return "The version's type."; + return tr("The version's type."); default: return QVariant(); diff --git a/logic/java/JavaVersionList.cpp b/logic/java/JavaVersionList.cpp index dcb6ced6..0a0be570 100644 --- a/logic/java/JavaVersionList.cpp +++ b/logic/java/JavaVersionList.cpp @@ -99,13 +99,13 @@ QVariant JavaVersionList::headerData(int section, Qt::Orientation orientation, i switch (section) { case 0: - return "Version"; + return tr("Version"); case 1: - return "Arch"; + return tr("Arch"); case 2: - return "Path"; + return tr("Path"); default: return QVariant(); @@ -115,13 +115,13 @@ QVariant JavaVersionList::headerData(int section, Qt::Orientation orientation, i switch (section) { case 0: - return "The name of the version."; + return tr("The name of the version."); case 1: - return "The architecture this version is for."; + return tr("The architecture this version is for."); case 2: - return "Path to this Java version."; + return tr("Path to this Java version."); default: return QVariant();