Skip to content

Commit

Permalink
Merge pull request qTox#4604
Browse files Browse the repository at this point in the history
Nikolay Korotkiy (1):
      fix(l10n): use native language names
  • Loading branch information
sudden6 committed Aug 30, 2017
2 parents 68c5cdf + 817a989 commit 89198f5
Showing 1 changed file with 14 additions and 42 deletions.
56 changes: 14 additions & 42 deletions src/widget/form/settings/generalform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,46 +76,6 @@ static QStringList locales = {
"zh_CN",
"zh_TW"
};
static QStringList langs = {
"Arabic",
"Беларуская",
"Български",
"Čeština",
"Dansk",
"Deutsch",
"Eesti",
"Ελληνικά",
"English",
"Español",
"Esperanto",
"Français",
"한국어",
"עברית",
"Hrvatski",
"Italiano",
"Kiswahili",
"Lietuvių",
"Lojban",
"Magyar",
"Nederlands",
"日本語",
"Norsk Bokmål",
"Pirate",
"Polski",
"Português",
"Română",
"Русский",
"Slovenčina",
"Slovenščina",
"Suomi",
"Svenska",
"தமிழ்",
"Türkçe",
"ئۇيغۇرچە",
"Українська",
"中文(中国)",
"繁體中文(台灣)"
};
// clang-format on

/**
Expand All @@ -139,8 +99,20 @@ GeneralForm::GeneralForm(SettingsWidget* myParent)
bodyUI->checkUpdates->setVisible(AUTOUPDATE_ENABLED);
bodyUI->checkUpdates->setChecked(s.getCheckUpdates());

for (int i = 0; i < langs.size(); ++i)
bodyUI->transComboBox->insertItem(i, langs[i]);
for (int i = 0; i < locales.size(); ++i) {
QString langName;

if (locales[i].startsWith(QLatin1String("eo"))) // QTBUG-57802
langName = QLocale::languageToString(QLocale::Esperanto);
else if (locales[i].startsWith(QLatin1String("jbo")))
langName = QLatin1String("Lojban");
else if (locales[i].startsWith(QLatin1String("pr")))
langName = QLatin1String("Pirate");
else
langName = QLocale(locales[i]).nativeLanguageName();

bodyUI->transComboBox->insertItem(i, langName);
}

bodyUI->transComboBox->setCurrentIndex(locales.indexOf(s.getTranslation()));

Expand Down

0 comments on commit 89198f5

Please sign in to comment.