Skip to content

BUG: Fix ctkLanguageComboBox locale normalization and selection #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hjmjohnson wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −3
Open

BUG: Fix ctkLanguageComboBox locale normalization and selection #1400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions Libs/Widgets/ctkLanguageComboBox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,13 @@ void ctkLanguageComboBoxPrivate::updateLanguageItems()
// we now sort based on the displayed text.
q->model()->sort(0, Qt::AscendingOrder);

// Restore selection
q->setCurrentIndex(q->findData(selectedLocaleCode));
// Restore selection (or select default language if no prior selection)
int restoredIndex = q->findData(selectedLocaleCode);
if (restoredIndex < 0 && !this->DefaultLanguage.isEmpty())
{
restoredIndex = q->findData(this->DefaultLanguage);
}
q->setCurrentIndex(restoredIndex);

q->update();

Expand Down Expand Up @@ -251,7 +256,29 @@ QString ctkLanguageComboBox::defaultLanguage() const
void ctkLanguageComboBox::setDefaultLanguage(const QString& localeCode)
{
Q_D(ctkLanguageComboBox);
d->DefaultLanguage = localeCode;
if (localeCode.isNull())
{
d->DefaultLanguage = QString();
}
else if (localeCode.isEmpty())
{
d->DefaultLanguage = localeCode;
}
else
{
// Normalize the locale code via QLocale. This expands bare language
// codes (e.g. "en" → "en_US") and rejects invalid codes.
QLocale locale(localeCode);
if (locale.name() == "C")
{
// QLocale returns "C" for unrecognized locale codes
d->DefaultLanguage = QString();
}
else
{
d->DefaultLanguage = locale.name();
}
}
d->updateLanguageItems();
}

Expand Down
Loading