From f3971dc014590610d94b42386ccb3f63ed684113 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Fri, 7 Aug 2020 13:26:00 +0300 Subject: [PATCH 1/2] Avoid translating "PrivateSend" --- src/qt/bitcoingui.cpp | 2 +- src/qt/overviewpage.cpp | 12 ++++++------ src/qt/transactiontablemodel.cpp | 2 +- src/qt/transactionview.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 8886c057764c..994b84543eab 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -314,7 +314,7 @@ void BitcoinGUI::createActions() sendCoinsMenuAction->setToolTip(sendCoinsMenuAction->statusTip()); privateSendCoinsAction = new QToolButton(this); - privateSendCoinsAction->setText(tr("&PrivateSend")); + privateSendCoinsAction->setText("&PrivateSend"); privateSendCoinsAction->setStatusTip(tr("PrivateSend coins to a Dash address")); privateSendCoinsAction->setToolTip(privateSendCoinsAction->statusTip()); privateSendCoinsAction->setCheckable(true); diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 654efa1b2c07..7e5ef9e655a7 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -535,7 +535,7 @@ void OverviewPage::privateSendStatus(bool fForce) tr("Note: You can turn this message off in options."); ui->labelPrivateSendEnabled->setToolTip(strWarn); LogPrint(BCLog::PRIVATESEND, "OverviewPage::privateSendStatus -- Very low number of keys left since last automatic backup, warning user and trying to create new backup...\n"); - QMessageBox::warning(this, tr("PrivateSend"), strWarn, QMessageBox::Ok, QMessageBox::Ok); + QMessageBox::warning(this, "PrivateSend", strWarn, QMessageBox::Ok, QMessageBox::Ok); } else { LogPrint(BCLog::PRIVATESEND, "OverviewPage::privateSendStatus -- Very low number of keys left since last automatic backup, skipping warning and trying to create new backup...\n"); } @@ -547,7 +547,7 @@ void OverviewPage::privateSendStatus(bool fForce) // It's still more or less safe to continue but warn user anyway LogPrint(BCLog::PRIVATESEND, "OverviewPage::privateSendStatus -- WARNING! Something went wrong on automatic backup: %s\n", strBackupWarning.toStdString()); - QMessageBox::warning(this, tr("PrivateSend"), + QMessageBox::warning(this, "PrivateSend", tr("WARNING! Something went wrong on automatic backup") + ":

" + strBackupWarning, QMessageBox::Ok, QMessageBox::Ok); } @@ -555,7 +555,7 @@ void OverviewPage::privateSendStatus(bool fForce) // Things are really broken, warn user and stop mixing immediately LogPrint(BCLog::PRIVATESEND, "OverviewPage::privateSendStatus -- ERROR! Failed to create automatic backup: %s\n", strBackupError.toStdString()); - QMessageBox::warning(this, tr("PrivateSend"), + QMessageBox::warning(this, "PrivateSend", tr("ERROR! Failed to create automatic backup") + ":

" + strBackupError + "
" + tr("Mixing is disabled, please close your wallet and fix the issue!"), QMessageBox::Ok, QMessageBox::Ok); @@ -601,7 +601,7 @@ void OverviewPage::togglePrivateSend(){ // Popup some information on first mixing QString hasMixed = settings.value("hasMixed").toString(); if(hasMixed.isEmpty()){ - QMessageBox::information(this, tr("PrivateSend"), + QMessageBox::information(this, "PrivateSend", tr("If you don't want to see internal PrivateSend fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."), QMessageBox::Ok, QMessageBox::Ok); settings.setValue("hasMixed", "hasMixed"); @@ -618,7 +618,7 @@ void OverviewPage::togglePrivateSend(){ const CAmount nMinAmount = CPrivateSend::GetSmallestDenomination() + CPrivateSend::GetMaxCollateralAmount(); if(currentBalance < nMinAmount){ QString strMinAmount(BitcoinUnits::formatWithUnit(nDisplayUnit, nMinAmount)); - QMessageBox::warning(this, tr("PrivateSend"), + QMessageBox::warning(this, "PrivateSend", tr("PrivateSend requires at least %1 to use.").arg(strMinAmount), QMessageBox::Ok, QMessageBox::Ok); return; @@ -632,7 +632,7 @@ void OverviewPage::togglePrivateSend(){ { //unlock was cancelled privateSendClientManager->nCachedNumBlocks = std::numeric_limits::max(); - QMessageBox::warning(this, tr("PrivateSend"), + QMessageBox::warning(this, "PrivateSend", tr("Wallet is locked and user declined to unlock. Disabling PrivateSend."), QMessageBox::Ok, QMessageBox::Ok); LogPrint(BCLog::PRIVATESEND, "OverviewPage::togglePrivateSend -- Wallet is locked and user declined to unlock. Disabling PrivateSend.\n"); diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index fe03b13077ae..b92e36c9e970 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -421,7 +421,7 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const case TransactionRecord::PrivateSendCreateDenominations: return tr("PrivateSend Create Denominations"); case TransactionRecord::PrivateSend: - return tr("PrivateSend"); + return "PrivateSend"; default: return QString(); diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index fe4189c3414d..f77ccdd0e2ba 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -89,7 +89,7 @@ TransactionView::TransactionView(QWidget* parent) : TransactionFilterProxy::TYPE(TransactionRecord::RecvFromOther)); typeWidget->addItem(tr("Sent to"), TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) | TransactionFilterProxy::TYPE(TransactionRecord::SendToOther)); - typeWidget->addItem(tr("PrivateSend"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSend)); + typeWidget->addItem("PrivateSend", TransactionFilterProxy::TYPE(TransactionRecord::PrivateSend)); typeWidget->addItem(tr("PrivateSend Make Collateral Inputs"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSendMakeCollaterals)); typeWidget->addItem(tr("PrivateSend Create Denominations"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSendCreateDenominations)); typeWidget->addItem(tr("PrivateSend Denominate"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSendDenominate)); From e31f5a340b02d89e6e53690484824ab0cbf19304 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Fri, 7 Aug 2020 13:26:43 +0300 Subject: [PATCH 2/2] Make some strings translatable --- src/qt/masternodelist.cpp | 6 +++--- src/qt/sendcoinsdialog.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp index 592c4abc2591..dcb6972c35d0 100644 --- a/src/qt/masternodelist.cpp +++ b/src/qt/masternodelist.cpp @@ -138,7 +138,7 @@ void MasternodeList::updateDIP3ListScheduled() // after filter was last changed unless we want to force the update. if (fFilterUpdatedDIP3) { int64_t nSecondsToWait = nTimeFilterUpdatedDIP3 - GetTime() + MASTERNODELIST_FILTER_COOLDOWN_SECONDS; - ui->countLabelDIP3->setText(QString::fromStdString(strprintf("Please wait... %d", nSecondsToWait))); + ui->countLabelDIP3->setText(tr("Please wait... %1").arg(nSecondsToWait)); if (nSecondsToWait <= 0) { updateDIP3List(); @@ -180,7 +180,7 @@ void MasternodeList::updateDIP3List() LOCK(cs_dip3list); QString strToFilter; - ui->countLabelDIP3->setText("Updating..."); + ui->countLabelDIP3->setText(tr("Updating...")); ui->tableWidgetMasternodesDIP3->setSortingEnabled(false); ui->tableWidgetMasternodesDIP3->clearContents(); ui->tableWidgetMasternodesDIP3->setRowCount(0); @@ -300,7 +300,7 @@ void MasternodeList::on_filterLineEditDIP3_textChanged(const QString& strFilterI strCurrentFilterDIP3 = strFilterIn; nTimeFilterUpdatedDIP3 = GetTime(); fFilterUpdatedDIP3 = true; - ui->countLabelDIP3->setText(QString::fromStdString(strprintf("Please wait... %d", MASTERNODELIST_FILTER_COOLDOWN_SECONDS))); + ui->countLabelDIP3->setText(tr("Please wait... %1").arg(MASTERNODELIST_FILTER_COOLDOWN_SECONDS)); } void MasternodeList::on_checkBoxMyMasternodesOnly_stateChanged(int state) diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 6f337837a1d8..2c218cede582 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -160,7 +160,7 @@ SendCoinsDialog::SendCoinsDialog(bool _fPrivateSend, QWidget* parent) : ui->sendButton->setText("PrivateS&end"); ui->sendButton->setToolTip("Confirm the PrivateSend action"); } else { - ui->sendButton->setText("S&end"); + ui->sendButton->setText(tr("S&end")); ui->sendButton->setToolTip("Confirm the send action"); } }