Replace some instances of formatWithUnit with formatHtmlWithUnit #7255

pull fanquake wants to merge 2 commits into bitcoin:master from fanquake:bitcoinunits-format changing 4 files +6 −12

fanquake commented at 3:54 AM on December 26, 2015: member

Strings in a HTML context should be using formatHtmlWithUnit.
Replace some instances of formatWithUnit with formatHtmlWithUnit
Strings in a HTML context should be using formatHtmlWithUnit.
5fdf32de7e
jonasschnelli added the label GUI on Dec 27, 2015
dcousens commented at 1:40 AM on December 29, 2015: contributor

light utACK

in src/qt/coincontroldialog.cpp:None in 5fdf32de7e outdated

 645 |      toolTip2 += tr("This label turns red if the priority is smaller than \"medium\".") + "<br /><br />";
 646 | -    toolTip2 += tr("This means a fee of at least %1 per kB is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CWallet::GetRequiredFee(1000)));
 647 | +    toolTip2 += tr("This means a fee of at least %1 per kB is required.").arg(BitcoinUnits::formatHtmlWithUnit(nDisplayUnit, CWallet::GetRequiredFee(1000)));
 648 |  
 649 | -    QString toolTip3 = tr("This label turns red if any recipient receives an amount smaller than %1.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, ::minRelayTxFee.GetFee(546)));
 650 | +    QString toolTip3 = tr("This label turns red if any recipient receives an amount smaller than %1.").arg(BitcoinUnits::formatHtmlWithUnit(nDisplayUnit, ::minRelayTxFee.GetFee(546)));

jonasschnelli commented at 4:28 PM on January 2, 2016:

Not related to this PR: but we should remove the hardcoded 546 here. I think just removing the number and changing the text to something like "This label turns red if any recipient receives an amount smaller then the current dust threshold") .

jonasschnelli commented at 4:50 PM on January 2, 2016:

@fanquake: mind packing this into this PR?

MarcoFalke commented at 5:39 PM on January 2, 2016:

Looks like it's already used in this cpp file. So could as well make it calculate the threshold every time? https://github.com/fanquake/bitcoin/blob/5fdf32de7ed85a1a0aec7cdedb83f750f4a0f7ff/src/qt/coincontroldialog.cpp#L577

Remove hardcoded fee from CoinControl ToolTip 6fd0a079d8
paveljanik commented at 1:23 PM on January 3, 2016: contributor

utACK
jonasschnelli commented at 8:22 AM on January 4, 2016: contributor

ACK 6fd0a079d8f9fa552d84be7a6787b1165b99b302
jonasschnelli merged this on Jan 4, 2016
jonasschnelli closed this on Jan 4, 2016
jonasschnelli referenced this in commit e289807e5a on Jan 4, 2016
luke-jr referenced this in commit 2a23e896de on Jan 10, 2016
luke-jr referenced this in commit 848699de1f on Jan 10, 2016
luke-jr referenced this in commit 966acb06da on Jan 10, 2016
luke-jr referenced this in commit 1d9663fba7 on Jan 10, 2016
luke-jr referenced this in commit 19d3f6bbeb on Jan 13, 2016
luke-jr referenced this in commit e8f2148879 on Jan 13, 2016
luke-jr referenced this in commit e20704ba71 on Jan 13, 2016
luke-jr referenced this in commit accb4f2c78 on Feb 12, 2016
fanquake deleted the branch on May 12, 2016
codablock referenced this in commit 6c0cc6f530 on Sep 5, 2017
UdjinM6 referenced this in commit 690cb58f80 on Sep 7, 2017
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels