From c8534de9ec632c331fae06e9a15358628ad1bd41 Mon Sep 17 00:00:00 2001
From: Chris Hennes <chennes@pioneerlibrarysystem.org>
Date: Mon, 6 May 2024 11:22:19 -0500
Subject: [PATCH] Start: Fix selection and ordering of language (#13823)

Fixes #13814.
---
 src/Mod/Start/Gui/GeneralSettingsWidget.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Mod/Start/Gui/GeneralSettingsWidget.cpp b/src/Mod/Start/Gui/GeneralSettingsWidget.cpp
index 72da566fd1..032d305571 100644
--- a/src/Mod/Start/Gui/GeneralSettingsWidget.cpp
+++ b/src/Mod/Start/Gui/GeneralSettingsWidget.cpp
@@ -104,7 +104,7 @@ gsl::owner<QComboBox*> GeneralSettingsWidget::createLanguageComboBox()
     auto comboBox = gsl::owner<QComboBox*>(new QComboBox);
     comboBox->addItem(QString::fromLatin1("English"), QByteArray("English"));
     Gui::TStringMap list = Gui::Translator::instance()->supportedLocales();
-    int index {0};
+    int index {1};
     for (auto it = list.begin(); it != list.end(); ++it, ++index) {
         QByteArray lang = it->first.c_str();
         QString langname = QString::fromLatin1(lang.constData());
@@ -129,6 +129,9 @@ gsl::owner<QComboBox*> GeneralSettingsWidget::createLanguageComboBox()
             comboBox->setCurrentIndex(index);
         }
     }
+    if (QAbstractItemModel* model = comboBox->model()) {
+        model->sort(0);
+    }
     _languageComboBox = comboBox;
     connect(_languageComboBox,
             qOverload<int>(&QComboBox::currentIndexChanged),