diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-07-20 12:05:52 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-07-20 12:05:54 +0200 |
| commit | 1737fec29739f3b867e81365f8a0bcd4dd138e82 (patch) | |
| tree | 376fee8fd0d7cb00cdb2e24cb57d8facc46b9fdf /src | |
| parent | Merge pull request #346 (diff) | |
| parent | Update after recent simplewallet string changes (diff) | |
| download | monero-1737fec29739f3b867e81365f8a0bcd4dd138e82.tar.xz | |
Merge pull request #347
9b83a43 Update after recent simplewallet string changes (moneromooo-monero)
35378f1 simplewallet: fix context/string order mismatch (moneromooo-monero)
e62692f simplewallet: use unsigned long long instead of size_t in message (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 8 | ||||
| -rw-r--r-- | src/simplewallet/simplewallet.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index dcb19ac15..d3c1f53e9 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1421,9 +1421,9 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_) total_fee += ptx_vector[n].fee; } - std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %u transactions. " + std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %llu transactions. " "This will result in a transaction fee being applied to each transaction, for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % - ptx_vector.size() % print_money(total_fee)).str(); + ((unsigned long long)ptx_vector.size()) % print_money(total_fee)).str(); std::string accepted = command_line::input_line(prompt_str); if (accepted != "Y" && accepted != "y" && accepted != "Yes" && accepted != "yes") { @@ -1552,9 +1552,9 @@ bool simple_wallet::sweep_dust(const std::vector<std::string> &args_) std::string prompt_str = tr("Sweeping ") + print_money(total_dust); if (ptx_vector.size() > 1) { - prompt_str = (boost::format(tr("Sweeping %s in %u transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % + prompt_str = (boost::format(tr("Sweeping %s in %llu transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % print_money(total_dust) % - ptx_vector.size() % + ((unsigned long long)ptx_vector.size()) % print_money(total_fee)).str(); } else { diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index c4411e4d4..8d7b0a811 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -169,7 +169,7 @@ namespace cryptonote if (std::chrono::milliseconds(1) < current_time - m_print_time || force) { - std::cout << QT_TRANSLATE_NOOP("Height ", "cryptonote::simple_wallet") << height << " / " << m_blockchain_height << '\r'; + std::cout << QT_TRANSLATE_NOOP("cryptonote::simple_wallet", "Height ") << height << " / " << m_blockchain_height << '\r'; m_print_time = current_time; } } |