18 files changed, 49 insertions, 11 deletions
diff --git a/launcher/ui/pages/global/APIPage.cpp b/launcher/ui/pages/global/APIPage.cpp
index 037ec217..83a778fa 100644
--- a/launcher/ui/pages/global/APIPage.cpp
+++ b/launcher/ui/pages/global/APIPage.cpp
@@ -85,3 +85,8 @@ bool APIPage::apply()
     applySettings();
     return true;
 }
+
+void APIPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
diff --git a/launcher/ui/pages/global/APIPage.h b/launcher/ui/pages/global/APIPage.h
index d9a84753..54c9d292 100644
--- a/launcher/ui/pages/global/APIPage.h
+++ b/launcher/ui/pages/global/APIPage.h
@@ -69,6 +69,7 @@ public:
         return "APIs";
     }
     virtual bool apply() override;
+    void retranslate() override;
 
 private:
     void loadSettings();
diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index af1d9d60..8d3c8e8c 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -104,6 +104,11 @@ AccountListPage::~AccountListPage()
     delete ui;
 }
 
+void AccountListPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
+
 void AccountListPage::ShowContextMenu(const QPoint& pos)
 {
     auto menu = ui->toolBar->createContextMenu(this, tr("Context menu"));
diff --git a/launcher/ui/pages/global/AccountListPage.h b/launcher/ui/pages/global/AccountListPage.h
index c1dea8be..2f5c2ef3 100644
--- a/launcher/ui/pages/global/AccountListPage.h
+++ b/launcher/ui/pages/global/AccountListPage.h
@@ -78,6 +78,7 @@ public:
     {
         return "Getting-Started#adding-an-account";
     }
+    void retranslate() override;
 
 public slots:
     void on_actionAddMojang_triggered();
diff --git a/launcher/ui/pages/global/CustomCommandsPage.cpp b/launcher/ui/pages/global/CustomCommandsPage.cpp
index 8541e3c1..b58d2c15 100644
--- a/launcher/ui/pages/global/CustomCommandsPage.cpp
+++ b/launcher/ui/pages/global/CustomCommandsPage.cpp
@@ -49,3 +49,8 @@ void CustomCommandsPage::loadSettings()
         s->get("PostExitCommand").toString()
     );
 }
+
+void CustomCommandsPage::retranslate()
+{
+    // fixme: implement
+}
diff --git a/launcher/ui/pages/global/CustomCommandsPage.h b/launcher/ui/pages/global/CustomCommandsPage.h
index a1155e0e..ea95c08a 100644
--- a/launcher/ui/pages/global/CustomCommandsPage.h
+++ b/launcher/ui/pages/global/CustomCommandsPage.h
@@ -47,6 +47,7 @@ public:
         return "Custom-commands";
     }
     bool apply() override;
+    void retranslate() override;
 
 private:
     void applySettings();
diff --git a/launcher/ui/pages/global/ExternalToolsPage.cpp b/launcher/ui/pages/global/ExternalToolsPage.cpp
index 41d900aa..40beccbc 100644
--- a/launcher/ui/pages/global/ExternalToolsPage.cpp
+++ b/launcher/ui/pages/global/ExternalToolsPage.cpp
@@ -231,3 +231,8 @@ bool ExternalToolsPage::apply()
     applySettings();
     return true;
 }
+
+void ExternalToolsPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
diff --git a/launcher/ui/pages/global/ExternalToolsPage.h b/launcher/ui/pages/global/ExternalToolsPage.h
index 5ae6148d..0c6f2a77 100644
--- a/launcher/ui/pages/global/ExternalToolsPage.h
+++ b/launcher/ui/pages/global/ExternalToolsPage.h
@@ -54,6 +54,7 @@ public:
         return "Tools";
     }
     virtual bool apply() override;
+    void retranslate() override;
 
 private:
     void loadSettings();
diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index bd79f11a..59f5213c 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -151,3 +151,8 @@ void JavaPage::checkerFinished()
 {
     checker.reset();
 }
+
+void JavaPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
diff --git a/launcher/ui/pages/global/JavaPage.h b/launcher/ui/pages/global/JavaPage.h
index 8f9b3323..8396695b 100644
--- a/launcher/ui/pages/global/JavaPage.h
+++ b/launcher/ui/pages/global/JavaPage.h
@@ -54,6 +54,7 @@ public:
         return "Java-settings";
     }
     bool apply() override;
+    void retranslate() override;
 
 private:
     void applySettings();
diff --git a/launcher/ui/pages/global/LanguagePage.cpp b/launcher/ui/pages/global/LanguagePage.cpp
index 359fdeeb..a4e6fd1e 100644
--- a/launcher/ui/pages/global/LanguagePage.cpp
+++ b/launcher/ui/pages/global/LanguagePage.cpp
@@ -40,12 +40,3 @@ void LanguagePage::retranslate()
 {
     mainWidget->retranslate();
 }
-
-void LanguagePage::changeEvent(QEvent* event)
-{
-    if (event->type() == QEvent::LanguageChange)
-    {
-        retranslate();
-    }
-    QWidget::changeEvent(event);
-}
diff --git a/launcher/ui/pages/global/LanguagePage.h b/launcher/ui/pages/global/LanguagePage.h
index b1dd05ad..7f870c5d 100644
--- a/launcher/ui/pages/global/LanguagePage.h
+++ b/launcher/ui/pages/global/LanguagePage.h
@@ -48,12 +48,11 @@ public:
     }
     bool apply() override;
 
-    void changeEvent(QEvent * ) override;
+    void retranslate() override;
 
 private:
     void applySettings();
     void loadSettings();
-    void retranslate();
 
 private:
     LanguageSelectionWidget *mainWidget;
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index ee68cd08..98271516 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -441,3 +441,8 @@ void LauncherPage::refreshFontPreview()
         workCursor.insertBlock();
     }
 }
+
+void LauncherPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
diff --git a/launcher/ui/pages/global/LauncherPage.h b/launcher/ui/pages/global/LauncherPage.h
index 4d0cf3c9..c142554f 100644
--- a/launcher/ui/pages/global/LauncherPage.h
+++ b/launcher/ui/pages/global/LauncherPage.h
@@ -57,6 +57,7 @@ public:
         return "Launcher-settings";
     }
     bool apply() override;
+    void retranslate() override;
 
 private:
     void applySettings();
diff --git a/launcher/ui/pages/global/MinecraftPage.cpp b/launcher/ui/pages/global/MinecraftPage.cpp
index 5470a586..1c7de39e 100644
--- a/launcher/ui/pages/global/MinecraftPage.cpp
+++ b/launcher/ui/pages/global/MinecraftPage.cpp
@@ -94,3 +94,8 @@ void MinecraftPage::loadSettings()
 
     ui->closeAfterLaunchCheck->setChecked(s->get("CloseAfterLaunch").toBool());
 }
+
+void MinecraftPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
diff --git a/launcher/ui/pages/global/MinecraftPage.h b/launcher/ui/pages/global/MinecraftPage.h
index 42626d94..61a25ba8 100644
--- a/launcher/ui/pages/global/MinecraftPage.h
+++ b/launcher/ui/pages/global/MinecraftPage.h
@@ -54,6 +54,7 @@ public:
         return "Minecraft-settings";
     }
     bool apply() override;
+    void retranslate() override;
 
 private:
     void updateCheckboxStuff();
diff --git a/launcher/ui/pages/global/ProxyPage.cpp b/launcher/ui/pages/global/ProxyPage.cpp
index 5bc8199e..77270399 100644
--- a/launcher/ui/pages/global/ProxyPage.cpp
+++ b/launcher/ui/pages/global/ProxyPage.cpp
@@ -104,3 +104,8 @@ void ProxyPage::loadSettings()
     ui->proxyUserEdit->setText(s->get("ProxyUser").toString());
     ui->proxyPassEdit->setText(s->get("ProxyPass").toString());
 }
+
+void ProxyPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
diff --git a/launcher/ui/pages/global/ProxyPage.h b/launcher/ui/pages/global/ProxyPage.h
index 6698c349..91173c44 100644
--- a/launcher/ui/pages/global/ProxyPage.h
+++ b/launcher/ui/pages/global/ProxyPage.h
@@ -51,6 +51,7 @@ public:
         return "Proxy-settings";
     }
     bool apply() override;
+    void retranslate() override;
 
 private:
     void updateCheckboxStuff();