wallet: Translate all initErrors in CreateWalletFromFile

MarcoFalke · MarcoFalke · commit fa61365a1368 · 2019-08-28T15:52:31.000-04:00
Every warning or error in this method is translated, except for those
two. Translate them as well for consistency.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4395,12 +4395,12 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
     }
 
     if (!gArgs.GetArg("-addresstype", "").empty() && !ParseOutputType(gArgs.GetArg("-addresstype", ""), walletInstance->m_default_address_type)) {
-        chain.initError(strprintf("Unknown address type '%s'", gArgs.GetArg("-addresstype", "")));
+        chain.initError(strprintf(_("Unknown address type '%s'").translated, gArgs.GetArg("-addresstype", "")));
         return nullptr;
     }
 
     if (!gArgs.GetArg("-changetype", "").empty() && !ParseOutputType(gArgs.GetArg("-changetype", ""), walletInstance->m_default_change_type)) {
-        chain.initError(strprintf("Unknown change type '%s'", gArgs.GetArg("-changetype", "")));
+        chain.initError(strprintf(_("Unknown change type '%s'").translated, gArgs.GetArg("-changetype", "")));
         return nullptr;
     }
 
@@ -4479,9 +4479,10 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
         walletInstance->m_default_max_tx_fee = nMaxFee;
     }
 
-    if (chain.relayMinFee().GetFeePerK() > HIGH_TX_FEE_PER_KB)
+    if (chain.relayMinFee().GetFeePerK() > HIGH_TX_FEE_PER_KB) {
         chain.initWarning(AmountHighWarn("-minrelaytxfee").translated + " " +
                     _("The wallet will avoid paying less than the minimum relay fee.").translated);
+    }
 
     walletInstance->m_confirm_target = gArgs.GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);
     walletInstance->m_spend_zero_conf_change = gArgs.GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);

Original file line number	Diff line number	Diff line change
`@@ -4395,12 +4395,12 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,`
`4395`	`4395`	`}`
`4396`	`4396`
`4397`	`4397`	`if (!gArgs.GetArg("-addresstype", "").empty() && !ParseOutputType(gArgs.GetArg("-addresstype", ""), walletInstance->m_default_address_type)) {`
`4398`		`- chain.initError(strprintf("Unknown address type '%s'", gArgs.GetArg("-addresstype", "")));`
	`4398`	`+ chain.initError(strprintf(_("Unknown address type '%s'").translated, gArgs.GetArg("-addresstype", "")));`
`4399`	`4399`	`return nullptr;`
`4400`	`4400`	`}`
`4401`	`4401`
`4402`	`4402`	`if (!gArgs.GetArg("-changetype", "").empty() && !ParseOutputType(gArgs.GetArg("-changetype", ""), walletInstance->m_default_change_type)) {`
`4403`		`- chain.initError(strprintf("Unknown change type '%s'", gArgs.GetArg("-changetype", "")));`
	`4403`	`+ chain.initError(strprintf(_("Unknown change type '%s'").translated, gArgs.GetArg("-changetype", "")));`
`4404`	`4404`	`return nullptr;`
`4405`	`4405`	`}`
`4406`	`4406`
`@@ -4479,9 +4479,10 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,`
`4479`	`4479`	`walletInstance->m_default_max_tx_fee = nMaxFee;`
`4480`	`4480`	`}`
`4481`	`4481`
`4482`		`- if (chain.relayMinFee().GetFeePerK() > HIGH_TX_FEE_PER_KB)`
	`4482`	`+ if (chain.relayMinFee().GetFeePerK() > HIGH_TX_FEE_PER_KB) {`
`4483`	`4483`	`chain.initWarning(AmountHighWarn("-minrelaytxfee").translated + " " +`
`4484`	`4484`	`_("The wallet will avoid paying less than the minimum relay fee.").translated);`
	`4485`	`+ }`
`4485`	`4486`
`4486`	`4487`	`walletInstance->m_confirm_target = gArgs.GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);`
`4487`	`4488`	`walletInstance->m_spend_zero_conf_change = gArgs.GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);`