diff options
| author | Luke Dashjr <[email protected]> | 2016-02-03 05:41:13 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2016-02-03 05:41:13 +0000 |
| commit | a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc (patch) | |
| tree | 7e3932c75353499d6659b4f5a94b40e07e64c364 /src/qt/recentrequeststablemodel.cpp | |
| parent | When/if the copyright line does not mention Bitcoin Core developers, add a se... (diff) | |
| parent | Merge #7091: Consensus build package (diff) | |
| download | discoin-a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc.tar.xz discoin-a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc.zip | |
Merge branch 'master' into single_prodname
Diffstat (limited to 'src/qt/recentrequeststablemodel.cpp')
| -rw-r--r-- | src/qt/recentrequeststablemodel.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index 5692a7aae..2335d6b28 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2014 The Bitcoin Core developers +// Copyright (c) 2011-2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -83,7 +83,7 @@ QVariant RecentRequestsTableModel::data(const QModelIndex &index, int role) cons } case Amount: if (rec->recipient.amount == 0 && role == Qt::DisplayRole) - return tr("(no amount)"); + return tr("(no amount requested)"); else if (role == Qt::EditRole) return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, BitcoinUnits::separatorNever); else @@ -125,12 +125,7 @@ void RecentRequestsTableModel::updateAmountColumnTitle() /** Gets title for amount column including current display unit if optionsModel reference available. */ QString RecentRequestsTableModel::getAmountTitle() { - QString amountTitle = tr("Amount"); - if (this->walletModel->getOptionsModel() != NULL) - { - amountTitle += " ("+BitcoinUnits::name(this->walletModel->getOptionsModel()->getDisplayUnit()) + ")"; - } - return amountTitle; + return (this->walletModel->getOptionsModel() != NULL) ? tr("Requested") + " ("+BitcoinUnits::name(this->walletModel->getOptionsModel()->getDisplayUnit()) + ")" : ""; } QModelIndex RecentRequestsTableModel::index(int row, int column, const QModelIndex &parent) const |