From 1a9569cf50ba01bb2cd9dd1c24374846fb5a9cef Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Fri, 26 Nov 2021 23:51:47 -0500 Subject: [PATCH] Make Filipino and all 3 letter language codes work --- src/mainwindow.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f980a81..6fd6713 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -214,7 +214,11 @@ void MainWindow::loadLanguage(QString& rLanguage) { QString lang = rLanguage; lang.chop(1); // remove trailing ) - lang = lang.right(2); // last 2 chars are the language code + + // remove everything up to the first ( + lang = lang.remove(0, lang.indexOf("(") + 1); + + // NOTE: language codes can be 2 or 3 letters if(m_currLang != lang) { qDebug() << __func__ << ": changing language to " << lang; @@ -528,20 +532,15 @@ void MainWindow::setupSettingsModal() { locale.remove(0, locale.lastIndexOf('_') + 1); // "de" QString lang = QLocale::languageToString(QLocale(locale).language()); - //QIcon ico(QString("%1/%2.png").arg(m_langPath).arg(locale)); QIcon ico; - QAction *action = new QAction(ico, lang, this); // ico, lang, this); - action->setCheckable(true); - action->setData(locale); - //settings.comboBoxLanguage->addItem(action); settings.comboBoxLanguage->addItem(lang + " (" + locale + ")"); qDebug() << __func__ << ": added lang=" << lang << " locale=" << locale; // set default translators and language checked if (defaultLocale == locale) { - action->setChecked(true); + settings.comboBoxLanguage->setCurrentIndex(i+1); qDebug() << " set defaultLocale=" << locale << " to checked"; } }