Skip to content

Commit 6e43129

Browse files
laanwjlaanwj
committed
Merge bitcoin#16745: wallet: Translate all initErrors in CreateWalletFromFile
fa61365 wallet: Translate all initErrors in CreateWalletFromFile (MarcoFalke) fa70d19 util: Make util/error bilingual_str (refactor) (MarcoFalke) Pull request description: The translations are going to close in three days (bitcoin#15940), so I am submitting this as a standalone pull request. Those changes are part of a bugfix bitcoin#16661, which includes a test. The first change (the refactor) is required, the second commit is not. I am happy to drop it, if needed. ACKs for top commit: laanwj: utACK fa61365 hebasto: ACK fa61365, I have tested the code on Linux Mint 19.2. Tree-SHA512: a7616cc38b9ffd301c6b915ea808a65815c3d97e9f57ec091772eb260e5cf0d75a13a6e4dfa3913e236833677c7929b9a748cb7d7a0e406d51749944b614e11b
2 parents d3e6721 + fa61365 commit 6e43129

File tree

4 files changed

+24
-21
lines changed

4 files changed

+24
-21
lines changed

‎src/init.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ bool AppInitParameterInteraction()
10601060
{
10611061
CAmount n = 0;
10621062
if (!ParseMoney(gArgs.GetArg("-incrementalrelayfee", ""), n))
1063-
return InitError(AmountErrMsg("incrementalrelayfee", gArgs.GetArg("-incrementalrelayfee", "")));
1063+
return InitError(AmountErrMsg("incrementalrelayfee", gArgs.GetArg("-incrementalrelayfee", "")).translated);
10641064
incrementalRelayFee = CFeeRate(n);
10651065
}
10661066

@@ -1104,7 +1104,7 @@ bool AppInitParameterInteraction()
11041104
if (gArgs.IsArgSet("-minrelaytxfee")) {
11051105
CAmount n = 0;
11061106
if (!ParseMoney(gArgs.GetArg("-minrelaytxfee", ""), n)) {
1107-
return InitError(AmountErrMsg("minrelaytxfee", gArgs.GetArg("-minrelaytxfee", "")));
1107+
return InitError(AmountErrMsg("minrelaytxfee", gArgs.GetArg("-minrelaytxfee", "")).translated);
11081108
}
11091109
// High fee check is done afterward in WalletParameterInteraction()
11101110
::minRelayTxFee = CFeeRate(n);
@@ -1120,7 +1120,7 @@ bool AppInitParameterInteraction()
11201120
{
11211121
CAmount n = 0;
11221122
if (!ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n))
1123-
return InitError(AmountErrMsg("blockmintxfee", gArgs.GetArg("-blockmintxfee", "")));
1123+
return InitError(AmountErrMsg("blockmintxfee", gArgs.GetArg("-blockmintxfee", "")).translated);
11241124
}
11251125

11261126
// Feerate used to define dust. Shouldn't be changed lightly as old
@@ -1129,7 +1129,7 @@ bool AppInitParameterInteraction()
11291129
{
11301130
CAmount n = 0;
11311131
if (!ParseMoney(gArgs.GetArg("-dustrelayfee", ""), n))
1132-
return InitError(AmountErrMsg("dustrelayfee", gArgs.GetArg("-dustrelayfee", "")));
1132+
return InitError(AmountErrMsg("dustrelayfee", gArgs.GetArg("-dustrelayfee", "")).translated);
11331133
dustRelayFee = CFeeRate(n);
11341134
}
11351135

‎src/util/error.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ std::string ResolveErrMsg(const std::string& optname, const std::string& strBind
4141
return strprintf(_("Cannot resolve -%s address: '%s'").translated, optname, strBind);
4242
}
4343

44-
std::string AmountHighWarn(const std::string& optname)
44+
bilingual_str AmountHighWarn(const std::string& optname)
4545
{
46-
return strprintf(_("%s is set very high!").translated, optname);
46+
return strprintf(_("%s is set very high!"), optname);
4747
}
4848

49-
std::string AmountErrMsg(const std::string& optname, const std::string& strValue)
49+
bilingual_str AmountErrMsg(const std::string& optname, const std::string& strValue)
5050
{
51-
return strprintf(_("Invalid amount for -%s=<amount>: '%s'").translated, optname, strValue);
51+
return strprintf(_("Invalid amount for -%s=<amount>: '%s'"), optname, strValue);
5252
}

‎src/util/error.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
#include <string>
1919

20+
struct bilingual_str;
21+
2022
enum class TransactionError {
2123
OK, //!< No error
2224
MISSING_INPUTS,
@@ -34,8 +36,8 @@ std::string TransactionErrorString(const TransactionError error);
3436

3537
std::string ResolveErrMsg(const std::string& optname, const std::string& strBind);
3638

37-
std::string AmountHighWarn(const std::string& optname);
39+
bilingual_str AmountHighWarn(const std::string& optname);
3840

39-
std::string AmountErrMsg(const std::string& optname, const std::string& strValue);
41+
bilingual_str AmountErrMsg(const std::string& optname, const std::string& strValue);
4042

4143
#endif // BITCOIN_UTIL_ERROR_H

‎src/wallet/wallet.cpp‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4387,23 +4387,23 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
43874387
}
43884388

43894389
if (!gArgs.GetArg("-addresstype", "").empty() && !ParseOutputType(gArgs.GetArg("-addresstype", ""), walletInstance->m_default_address_type)) {
4390-
chain.initError(strprintf("Unknown address type '%s'", gArgs.GetArg("-addresstype", "")));
4390+
chain.initError(strprintf(_("Unknown address type '%s'").translated, gArgs.GetArg("-addresstype", "")));
43914391
return nullptr;
43924392
}
43934393

43944394
if (!gArgs.GetArg("-changetype", "").empty() && !ParseOutputType(gArgs.GetArg("-changetype", ""), walletInstance->m_default_change_type)) {
4395-
chain.initError(strprintf("Unknown change type '%s'", gArgs.GetArg("-changetype", "")));
4395+
chain.initError(strprintf(_("Unknown change type '%s'").translated, gArgs.GetArg("-changetype", "")));
43964396
return nullptr;
43974397
}
43984398

43994399
if (gArgs.IsArgSet("-mintxfee")) {
44004400
CAmount n = 0;
44014401
if (!ParseMoney(gArgs.GetArg("-mintxfee", ""), n) || 0 == n) {
4402-
chain.initError(AmountErrMsg("mintxfee", gArgs.GetArg("-mintxfee", "")));
4402+
chain.initError(AmountErrMsg("mintxfee", gArgs.GetArg("-mintxfee", "")).translated);
44034403
return nullptr;
44044404
}
44054405
if (n > HIGH_TX_FEE_PER_KB) {
4406-
chain.initWarning(AmountHighWarn("-mintxfee") + " " +
4406+
chain.initWarning(AmountHighWarn("-mintxfee").translated + " " +
44074407
_("This is the minimum transaction fee you pay on every transaction.").translated);
44084408
}
44094409
walletInstance->m_min_fee = CFeeRate(n);
@@ -4417,7 +4417,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
44174417
return nullptr;
44184418
}
44194419
if (nFeePerK > HIGH_TX_FEE_PER_KB) {
4420-
chain.initWarning(AmountHighWarn("-fallbackfee") + " " +
4420+
chain.initWarning(AmountHighWarn("-fallbackfee").translated + " " +
44214421
_("This is the transaction fee you may pay when fee estimates are not available.").translated);
44224422
}
44234423
walletInstance->m_fallback_fee = CFeeRate(nFeePerK);
@@ -4430,19 +4430,19 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
44304430
return nullptr;
44314431
}
44324432
if (nFeePerK > HIGH_TX_FEE_PER_KB) {
4433-
chain.initWarning(AmountHighWarn("-discardfee") + " " +
4433+
chain.initWarning(AmountHighWarn("-discardfee").translated + " " +
44344434
_("This is the transaction fee you may discard if change is smaller than dust at this level").translated);
44354435
}
44364436
walletInstance->m_discard_rate = CFeeRate(nFeePerK);
44374437
}
44384438
if (gArgs.IsArgSet("-paytxfee")) {
44394439
CAmount nFeePerK = 0;
44404440
if (!ParseMoney(gArgs.GetArg("-paytxfee", ""), nFeePerK)) {
4441-
chain.initError(AmountErrMsg("paytxfee", gArgs.GetArg("-paytxfee", "")));
4441+
chain.initError(AmountErrMsg("paytxfee", gArgs.GetArg("-paytxfee", "")).translated);
44424442
return nullptr;
44434443
}
44444444
if (nFeePerK > HIGH_TX_FEE_PER_KB) {
4445-
chain.initWarning(AmountHighWarn("-paytxfee") + " " +
4445+
chain.initWarning(AmountHighWarn("-paytxfee").translated + " " +
44464446
_("This is the transaction fee you will pay if you send a transaction.").translated);
44474447
}
44484448
walletInstance->m_pay_tx_fee = CFeeRate(nFeePerK, 1000);
@@ -4457,7 +4457,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
44574457
{
44584458
CAmount nMaxFee = 0;
44594459
if (!ParseMoney(gArgs.GetArg("-maxtxfee", ""), nMaxFee)) {
4460-
chain.initError(AmountErrMsg("maxtxfee", gArgs.GetArg("-maxtxfee", "")));
4460+
chain.initError(AmountErrMsg("maxtxfee", gArgs.GetArg("-maxtxfee", "")).translated);
44614461
return nullptr;
44624462
}
44634463
if (nMaxFee > HIGH_MAX_TX_FEE) {
@@ -4471,9 +4471,10 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
44714471
walletInstance->m_default_max_tx_fee = nMaxFee;
44724472
}
44734473

4474-
if (chain.relayMinFee().GetFeePerK() > HIGH_TX_FEE_PER_KB)
4475-
chain.initWarning(AmountHighWarn("-minrelaytxfee") + " " +
4474+
if (chain.relayMinFee().GetFeePerK() > HIGH_TX_FEE_PER_KB) {
4475+
chain.initWarning(AmountHighWarn("-minrelaytxfee").translated + " " +
44764476
_("The wallet will avoid paying less than the minimum relay fee.").translated);
4477+
}
44774478

44784479
walletInstance->m_confirm_target = gArgs.GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);
44794480
walletInstance->m_spend_zero_conf_change = gArgs.GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);

0 commit comments

Comments
 (0)