0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default to system locale language

Browse Source
This commit is contained in:
Philipp David 2022-01-12 17:44:58 +01:00
parent 2c2c22ccf8
commit 236c0166f6
No known key found for this signature in database
GPG Key ID: 967A5D5EB5071577
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
launcher/translations/TranslationsModel.cpp
View File

@ -143,6 +143,8 @@ struct TranslationsModel::Private
std::unique_ptr<POTranslator> m_po_translator; std::unique_ptr<POTranslator> m_po_translator;
QFileSystemWatcher *watcher; QFileSystemWatcher *watcher;
bool no_language_set = false;
}; };
TranslationsModel::TranslationsModel(QString path, QObject* parent): QAbstractListModel(parent) TranslationsModel::TranslationsModel(QString path, QObject* parent): QAbstractListModel(parent)
@ -165,8 +167,27 @@ void TranslationsModel::translationDirChanged(const QString& path)
{ {
qDebug() << "Dir changed:" << path; qDebug() << "Dir changed:" << path;
reloadLocalFiles(); reloadLocalFiles();
if (d->no_language_set)
{
auto bcp47Name = QLocale::system().name();
if (!findLanguage(bcp47Name))
{
bcp47Name = bcp47Name.split('_').front();
}
selectLanguage(bcp47Name);
if (selectedLanguage() != defaultLangCode)
{
updateLanguage(selectedLanguage());
APPLICATION->settings()->set("Language", selectedLanguage());
}
d->no_language_set = false;
}
else
{
selectLanguage(selectedLanguage()); selectLanguage(selectedLanguage());
} }
}
void TranslationsModel::indexReceived() void TranslationsModel::indexReceived()
{ {
@ -439,6 +460,12 @@ bool TranslationsModel::selectLanguage(QString key)
{ {
QString &langCode = key; QString &langCode = key;
auto langPtr = findLanguage(key); auto langPtr = findLanguage(key);
if (langCode.length() == 0)
{
d->no_language_set = true;
}
if(!langPtr) if(!langPtr)
{ {
qWarning() << "Selected invalid language" << key << ", defaulting to" << defaultLangCode; qWarning() << "Selected invalid language" << key << ", defaulting to" << defaultLangCode;