Merge branch 'PolyMC:develop' into feature/download_mods

1 files changed, 11 insertions, 0 deletions

diff --git a/launcher/ui/widgets/LanguageSelectionWidget.cpp b/launcher/ui/widgets/LanguageSelectionWidget.cpp
index cf70c7b4..964d2b7c 100644
--- a/launcher/ui/widgets/LanguageSelectionWidget.cpp
+++ b/launcher/ui/widgets/LanguageSelectionWidget.cpp
@@ -6,6 +6,7 @@
 #include <QLabel>
 #include "Application.h"
 #include "translations/TranslationsModel.h"
+#include "settings/Setting.h"
 
 LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) :
     QWidget(parent)
@@ -37,6 +38,9 @@ LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) :
     languageView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
     connect(languageView->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &LanguageSelectionWidget::languageRowChanged);
     verticalLayout->setContentsMargins(0,0,0,0);
+
+    auto language_setting = APPLICATION->settings()->getSetting("Language");
+    connect(language_setting.get(), &Setting::SettingChanged, this, &LanguageSelectionWidget::languageSettingChanged);
 }
 
 QString LanguageSelectionWidget::getSelectedLanguageKey() const
@@ -64,3 +68,10 @@ void LanguageSelectionWidget::languageRowChanged(const QModelIndex& current, con
     translations->selectLanguage(key);
     translations->updateLanguage(key);
 }
+
+void LanguageSelectionWidget::languageSettingChanged(const Setting &, const QVariant)
+{
+    auto translations = APPLICATION->translations();
+    auto index = translations->selectedIndex();
+    languageView->setCurrentIndex(index);
+}