CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #601 from Scrumplex/fix-translations-3

Browse Source
This commit is contained in:
flow 2022-12-13 07:01:23 -08:00 committed by GitHub
commit e05ccc0e55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
launcher/ui/pages/instance/ManagedPackPage.cpp
View File

@ -227,17 +227,16 @@ void ModrinthManagedPackPage::parseManagedPack()
ui->versionsComboBox->blockSignals(false); ui->versionsComboBox->blockSignals(false);
for (auto version : m_pack.versions) { for (auto version : m_pack.versions) {
QString name; QString name = version.version;
if (!version.name.contains(version.version)) if (!version.name.contains(version.version))
name = QString("%1 — %2").arg(version.name, version.version); name = QString("%1 — %2").arg(version.name, version.version);
else
name = version.name;
// NOTE: the id from version isn't the same id in the modpack format spec... // NOTE: the id from version isn't the same id in the modpack format spec...
// e.g. HexMC's 4.4.0 has versionId 4.0.0 in the modpack index.............. // e.g. HexMC's 4.4.0 has versionId 4.0.0 in the modpack index..............
if (version.version == m_inst->getManagedPackVersionName()) if (version.version == m_inst->getManagedPackVersionName())
name.append(tr(" (Current)")); name = tr("%1 (Current)").arg(name);
ui->versionsComboBox->addItem(name, QVariant(version.id)); ui->versionsComboBox->addItem(name, QVariant(version.id));
} }
@ -374,12 +373,10 @@ void FlameManagedPackPage::parseManagedPack()
ui->versionsComboBox->blockSignals(false); ui->versionsComboBox->blockSignals(false);
for (auto version : m_pack.versions) { for (auto version : m_pack.versions) {
QString name; QString name = version.version;
name = version.version;
if (version.fileId == m_inst->getManagedPackVersionID().toInt()) if (version.fileId == m_inst->getManagedPackVersionID().toInt())
name.append(tr(" (Current)")); name = tr("%1 (Current)").arg(name);
ui->versionsComboBox->addItem(name, QVariant(version.fileId)); ui->versionsComboBox->addItem(name, QVariant(version.fileId));
} }