From 60b38de69f43f2623b7c972e5072fc4ce5aeb3c4 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 24 Sep 2022 11:43:54 +0200 Subject: [PATCH 1/2] fix: fallback for languages without a native name Signed-off-by: Sefa Eyeoglu --- launcher/translations/TranslationsModel.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp index 848b4d19..a1ebd0c1 100644 --- a/launcher/translations/TranslationsModel.cpp +++ b/launcher/translations/TranslationsModel.cpp @@ -86,6 +86,10 @@ struct Language else { result = locale.nativeLanguageName(); } + + if (result.isEmpty()) { + result = key; + } return result; } From b187231b0ea798cd8ebeaa200b4befe29a433a55 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 24 Sep 2022 11:48:14 +0200 Subject: [PATCH 2/2] fix: sort languages by their name instead of key Signed-off-by: Sefa Eyeoglu --- launcher/translations/TranslationsModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp index a1ebd0c1..2f57de3a 100644 --- a/launcher/translations/TranslationsModel.cpp +++ b/launcher/translations/TranslationsModel.cpp @@ -398,7 +398,7 @@ void TranslationsModel::reloadLocalFiles() return false; } } - return a.key < b.key; + return a.languageName().toLower() < b.languageName().toLower(); }); endInsertRows(); }