mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 19:11:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify code for translation loading

Browse Source 
Don't have two identical loops for loading languages from files and from
resources.
This commit is contained in:
Martin Kleusberg
2015-05-18 15:44:57 +02:00
parent 8aa72c94d4
commit a342194443
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/PreferencesDialog.cpp
View File

@@ -394,8 +394,10 @@ void PreferencesDialog::fillLanguageBox()
"en_US");
}
// append availeble *.qm files from translation dir near executable
foreach(const QFileInfo &file, translationsDir.entryInfoList())
// Get available *.qm files from translation dir near executable as well as from resources
QFileInfoList file_infos = translationsDir.entryInfoList();
file_infos += QDir(":/translations").entryInfoList();
foreach(const QFileInfo &file, file_infos)
{
QLocale locale(file.baseName().remove("sqlb_"));
@@ -403,25 +405,7 @@ void PreferencesDialog::fillLanguageBox()
if(locale.name() == "C")
continue;
QString language = QLocale::languageToString(locale.language()) + " (" +
QLocale::countryToString(locale.country()) + ")";
if (locale == systemLocale)
language += " [System language]";
ui->languageComboBox->addItem(QIcon(":/flags/" + locale.name()), language, locale.name());
}
// append *.qm files from resources
foreach (const QFileInfo &file, QDir(":/translations").entryInfoList())
{
QLocale locale(file.baseName().remove("sqlb_"));
// Skip invalid locales
if(locale.name() == "C")
continue;
// Translation for this locale already loaded in previous foreach
// Skip translations that were already loaded
if (ui->languageComboBox->findData(locale.name(), Qt::UserRole, Qt::MatchExactly) != -1)
continue;