4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-15 04:46:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #345

Browse Source 
3c13da5 boost doesn't like %zu for size_t, replace with %u (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-07-18 23:02:50 +02:00
commit 7ef8e5c033
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 270 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/simplewallet/simplewallet.cpp
View File

@ -1356,7 +1356,7 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
// if more than one tx necessary, prompt user to confirm // if more than one tx necessary, prompt user to confirm
if (ptx_vector.size() > 1) if (ptx_vector.size() > 1)
{ {
std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %zu transactions. " std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %u transactions. "
"This will result in a transaction fee being applied to each transaction. Is this okay? (Y/Yes/N/No)")) % "This will result in a transaction fee being applied to each transaction. Is this okay? (Y/Yes/N/No)")) %
ptx_vector.size()).str(); ptx_vector.size()).str();
std::string accepted = command_line::input_line(prompt_str); std::string accepted = command_line::input_line(prompt_str);
@ -1487,7 +1487,7 @@ bool simple_wallet::sweep_dust(const std::vector<std::string> &args_)
std::string prompt_str = tr("Sweeping ") + print_money(total_dust); std::string prompt_str = tr("Sweeping ") + print_money(total_dust);
if (ptx_vector.size() > 1) { if (ptx_vector.size() > 1) {
prompt_str = (boost::format(tr("Sweeping %s in %zu transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % prompt_str = (boost::format(tr("Sweeping %s in %u transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) %
print_money(total_dust) % print_money(total_dust) %
ptx_vector.size() % ptx_vector.size() %
print_money(total_fee)).str(); print_money(total_fee)).str();

581
translations/monero.ts
View File

File diff suppressed because it is too large Load Diff