diff --git a/src/qt/forms/proposalwizard.ui b/src/qt/forms/proposalwizard.ui index d8b749cc65d4..046be2a81ecf 100644 --- a/src/qt/forms/proposalwizard.ui +++ b/src/qt/forms/proposalwizard.ui @@ -110,7 +110,7 @@ - short-unique-name + short-unique-name 24 @@ -136,7 +136,7 @@ - https://example.com/my-proposal + https://example.com/my-proposal 24 @@ -255,7 +255,7 @@ - 0 + 0 @@ -342,7 +342,7 @@ - - + - @@ -427,7 +427,7 @@ - TxID: + TxID: @@ -437,7 +437,7 @@ true - - + - 24 @@ -661,7 +661,7 @@ true - - + - 24 diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp index 35567f47eb2b..49c6abe6e628 100644 --- a/src/qt/governancelist.cpp +++ b/src/qt/governancelist.cpp @@ -595,18 +595,17 @@ void GovernanceList::voteForProposal(vote_outcome_enum_t outcome) // Show results QString message; - if (nSuccessful > 0 && nFailed == 0) { - message = tr("Voted successfully %1 time(s).").arg(nSuccessful); - } else if (nSuccessful > 0 && nFailed > 0) { - message = tr("Voted successfully %1 time(s) and failed %2 time(s).").arg(nSuccessful).arg(nFailed); - if (!failedMessages.isEmpty()) { - message += tr("\n\nFailed votes:\n%1").arg(failedMessages.join("\n")); - } - } else { - message = tr("Failed to vote %1 time(s).").arg(nFailed); - if (!failedMessages.isEmpty()) { - message += tr("\n\nErrors:\n%1").arg(failedMessages.join("\n")); + if (nSuccessful > 0) { + message += tr("Voted successfully %n time(s)", "", nSuccessful); + } + if (nFailed > 0) { + if (nSuccessful > 0) { + message += QString("\n"); } + message += tr("Failed to vote %n time(s)", "", nFailed); + } + if (!failedMessages.isEmpty()) { + message += QString("\n\n") + tr("Errors:") + QString("\n") + failedMessages.join("\n"); } QMessageBox::information(this, tr("Voting Results"), message); diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp index b4cd0f06432c..3b61a9fa3976 100644 --- a/src/qt/proposalwizard.cpp +++ b/src/qt/proposalwizard.cpp @@ -60,7 +60,7 @@ ProposalWizard::ProposalWizard(interfaces::Node& node, WalletModel* walletModel, // Initialize fields // Populate payments dropdown (mainnet 1..12 by default; adjust by network later if needed) for (int i = 1; i <= 12; ++i) { - m_ui->comboPayments->addItem(tr("%1").arg(i), i); + m_ui->comboPayments->addItem(QString().setNum(i), i); } m_ui->comboPayments->setCurrentIndex(0); @@ -290,8 +290,8 @@ void ProposalWizard::onMaybeAdvanceAfterConfirmations() if (m_confirmTimer) m_confirmTimer->stop(); } else { const auto mins = (secs + 59) / 60; - m_ui->labelEta->setText(tr("Estimated time remaining: %1 min").arg(mins)); - m_ui->labelEta2->setText(tr("Estimated time remaining: %1 min").arg(mins)); + m_ui->labelEta->setText(tr("Estimated time remaining: %n minute(s)", "", mins)); + m_ui->labelEta2->setText(tr("Estimated time remaining: %n minute(s)", "", mins)); } } // Allow submitting (relay/postpone) at 1 confirmation and enable Next to proceed @@ -321,7 +321,8 @@ void ProposalWizard::onSubmit() const QString govId = QString::fromStdString(obj_hash); m_ui->editGovObjId->setText(govId); QMessageBox::information(this, tr("Proposal submitted"), - tr("Your proposal was submitted successfully.\nID: %1").arg(govId)); + tr("Your proposal was submitted successfully.") + + QString("\nID: %1").arg(govId)); m_submitted = true; m_ui->btnSubmit->setEnabled(false); // When 6 confs are reached show a final success message