squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-17 14:08:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the language selection in the combobox when the system locale only has a lang equivalent and not a lang_COUNTRY one. Closes #1786.

Browse Source
This commit is contained in:
sledgehammer999
2014-11-30 01:58:07 +02:00
parent 5d79fcdafd
commit e5e22eb925
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/preferences/options_imp.cpp
View File

@@ -275,8 +275,8 @@ void options_imp::initializeLanguageCombo()
localeStr.chop(3); // Remove ".qm" localeStr.chop(3); // Remove ".qm"
QLocale locale(localeStr); QLocale locale(localeStr);
QString language_name = languageToLocalizedString(locale); QString language_name = languageToLocalizedString(locale);
comboI18n->addItem(/*QIcon(":/Icons/flags/"+country+".png"), */language_name, locale.name()); comboI18n->addItem(/*QIcon(":/Icons/flags/"+country+".png"), */language_name, localeStr);
qDebug() << "Supported locale:" << locale.name(); qDebug() << "Supported locale:" << localeStr;
} }
} }
@@ -1026,10 +1026,19 @@ QString options_imp::getLocale() const {
void options_imp::setLocale(const QString &localeStr) { void options_imp::setLocale(const QString &localeStr) {
QLocale locale(localeStr); QLocale locale(localeStr);
QString name = locale.name();
// Attempt to find exact match // Attempt to find exact match
int index = comboI18n->findData(locale.name(), Qt::UserRole); int index = comboI18n->findData(name, Qt::UserRole);
if (index < 0 ) {
//Attempt to find a language match without a country
int pos = name.indexOf('_');
if (pos > -1) {
QString lang = name.left(pos);
index = comboI18n->findData(lang, Qt::UserRole);
}
}
if (index < 0) { if (index < 0) {
// Unreconized, use US English // Unrecognized, use US English
index = comboI18n->findData(QLocale("en").name(), Qt::UserRole); index = comboI18n->findData(QLocale("en").name(), Qt::UserRole);
Q_ASSERT(index >= 0); Q_ASSERT(index >= 0);
} }