From 85f3fc9944914927e561ec2664922661c58264e2 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 26 Mar 2022 22:21:08 +0100
Subject: fix: remove "PolyMC" from strings

---
 launcher/ui/dialogs/AboutDialog.cpp          | 7 +++++--
 launcher/ui/pages/global/AccountListPage.cpp | 7 ++++---
 launcher/ui/pages/instance/VersionPage.cpp   | 2 +-
 launcher/ui/pages/modplatform/ModModel.cpp   | 4 +++-
 4 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'launcher/ui')

diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index ef96cc23..d071da9a 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "AboutDialog.h"
+#include "BuildConfig.h"
 #include "ui_AboutDialog.h"
 #include <QIcon>
 #include "Application.h"
@@ -33,13 +34,15 @@ QString getCreditsHtml()
     stream.setCodec(QTextCodec::codecForName("UTF-8"));
     stream << "<center>\n";
 
-    stream << "<h3>" << QObject::tr("PolyMC Developers", "About Credits") << "</h3>\n";
+    //: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Developers"
+    stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg(BuildConfig.LAUNCHER_NAME) << "</h3>\n";
     stream << "<p>swirl &lt;<a href='mailto:swurl@swurl.xyz'>swurl@swurl.xyz </a>&gt;</p>\n";
     stream << "<p>LennyMcLennington &lt;<a href='mailto:lenny@sneed.church'>lenny@sneed.church</a>&gt;</p>\n";
     stream << "<br />\n";
 
     // TODO: possibly retrieve from git history at build time?
-    stream << "<h3>" << QObject::tr("MultiMC Developers", "About Credits") << "</h3>\n";
+    //: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Developers"
+    stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg("MultiMC") << "</h3>\n";
     stream << "<p>Andrew Okin &lt;<a href='mailto:forkk@forkk.net'>forkk@forkk.net</a>&gt;</p>\n";
     stream << "<p>Petr Mrázek &lt;<a href='mailto:peterix@gmail.com'>peterix@gmail.com</a>&gt;</p>\n";
     stream << "<p>Sky Welch &lt;<a href='mailto:multimc@bunnies.io'>multimc@bunnies.io</a>&gt;</p>\n";
diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index 1edba499..6e1e2183 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -161,10 +161,11 @@ void AccountListPage::on_actionAddMicrosoft_triggered()
         CustomMessageBox::selectable(
             this,
             tr("Microsoft Accounts not available"),
+            //: %1 refers to the launcher itself
             tr(
-                "Microsoft accounts are only usable on macOS 10.13 or newer, with fully updated PolyMC.\n\n"
-                "Please update both your operating system and PolyMC."
-            ),
+                "Microsoft accounts are only usable on macOS 10.13 or newer, with fully updated %1.\n\n"
+                "Please update both your operating system and %1."
+            ).arg(BuildConfig.LAUNCHER_NAME),
             QMessageBox::Warning
         )->exec();
         return;
diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
index 97c6fe8f..c417891b 100644
--- a/launcher/ui/pages/instance/VersionPage.cpp
+++ b/launcher/ui/pages/instance/VersionPage.cpp
@@ -422,7 +422,7 @@ void VersionPage::on_actionDownload_All_triggered()
     {
         CustomMessageBox::selectable(
             this, tr("Error"),
-            tr("PolyMC cannot download Minecraft or update instances unless you have at least "
+            tr("Cannot download Minecraft or update instances unless you have at least "
                "one account added.\nPlease add your Mojang or Minecraft account."),
             QMessageBox::Warning)->show();
         return;
diff --git a/launcher/ui/pages/modplatform/ModModel.cpp b/launcher/ui/pages/modplatform/ModModel.cpp
index cc3c5326..b06eaf8e 100644
--- a/launcher/ui/pages/modplatform/ModModel.cpp
+++ b/launcher/ui/pages/modplatform/ModModel.cpp
@@ -1,5 +1,6 @@
 #include "ModModel.h"
 
+#include "BuildConfig.h"
 #include "Json.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
@@ -186,7 +187,8 @@ void ListModel::searchRequestFailed(QString reason)
     if (jobPtr->first()->m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 409) {
         // 409 Gone, notify user to update
         QMessageBox::critical(nullptr, tr("Error"),
-                              QString("%1 %2").arg(m_parent->displayName()).arg(tr("API version too old!\nPlease update PolyMC!")));
+                              //: %1 refers to the launcher itself
+                              QString("%1 %2").arg(m_parent->displayName()).arg(tr("API version too old!\nPlease update %1!").arg(BuildConfig.LAUNCHER_NAME)));
         // self-destruct
         (dynamic_cast<ModDownloadDialog*>((dynamic_cast<ModPage*>(parent()))->parentWidget()))->reject();
     }
-- 
cgit