mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-04-27 07:48:01 -07:00
Translation code fix; updated German translation
This commit is contained in:
parent
e09060faca
commit
5ee6bdd338
5 changed files with 743 additions and 679 deletions
|
|
@ -103,19 +103,15 @@ GeneralSettingsPage::GeneralSettingsPage()
|
|||
QStringList GeneralSettingsPage::findQmFiles()
|
||||
{
|
||||
QDir dir(":/translations");
|
||||
QStringList fileNames = dir.entryList(QStringList("*.qm"), QDir::Files, QDir::Name);
|
||||
QMutableStringListIterator i(fileNames);
|
||||
while (i.hasNext()) {
|
||||
i.next();
|
||||
i.setValue(dir.filePath(i.value()));
|
||||
}
|
||||
QStringList fileNames = dir.entryList(QStringList(translationPrefix + "_*.qm"), QDir::Files, QDir::Name);
|
||||
fileNames.replaceInStrings(QRegExp(translationPrefix + "_(.*)\\.qm"), "\\1");
|
||||
return fileNames;
|
||||
}
|
||||
|
||||
QString GeneralSettingsPage::languageName(const QString &qmFile)
|
||||
{
|
||||
QTranslator translator;
|
||||
translator.load(qmFile);
|
||||
translator.load(":/translations/" + translationPrefix + "_" + qmFile + ".qm");
|
||||
|
||||
return translator.translate("GeneralSettingsPage", "English");
|
||||
}
|
||||
|
|
@ -165,8 +161,7 @@ void GeneralSettingsPage::cardBackgroundPathButtonClicked()
|
|||
|
||||
void GeneralSettingsPage::languageBoxChanged(int index)
|
||||
{
|
||||
QString qmFile = languageBox->itemData(index).toString();
|
||||
settingsCache->setLang(qmFile);
|
||||
settingsCache->setLang(languageBox->itemData(index).toString());
|
||||
}
|
||||
|
||||
void GeneralSettingsPage::retranslateUi()
|
||||
|
|
@ -473,8 +468,7 @@ void DlgSettings::changePage(QListWidgetItem *current, QListWidgetItem *previous
|
|||
void DlgSettings::updateLanguage()
|
||||
{
|
||||
qApp->removeTranslator(translator);
|
||||
translator->load(settingsCache->getLang());
|
||||
qApp->installTranslator(translator);
|
||||
installNewTranslator();
|
||||
}
|
||||
|
||||
void DlgSettings::changeEvent(QEvent *event)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue