wallet: Remove trailing whitespace from potential translation strings

MarcoFalke · MarcoFalke · commit fa2cce4391b0 · 2020-05-01T07:41:32.000-04:00
If the potential translation strings are translated in the future,
trailing whitespace is going to make translation effort harder.
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp
@@ -220,7 +220,7 @@ Result CreateRateBumpTransaction(CWallet& wallet, const uint256& txid, const CCo
     int change_pos_in_out = -1; // No requested location for change
     bilingual_str fail_reason;
     if (!wallet.CreateTransaction(recipients, tx_new, fee_ret, change_pos_in_out, fail_reason, new_coin_control, false)) {
-        errors.push_back(Untranslated("Unable to create transaction: ") + Untranslated(" ") + fail_reason);
+        errors.push_back(Untranslated("Unable to create transaction.") + Untranslated(" ") + fail_reason);
         return Result::WALLET_ERROR;
     }
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -154,13 +154,13 @@ std::shared_ptr<CWallet> LoadWallet(interfaces::Chain& chain, const WalletLocati
 {
     try {
         if (!CWallet::Verify(chain, location, false, error, warnings)) {
-            error = Untranslated("Wallet file verification failed: ") + error;
+            error = Untranslated("Wallet file verification failed.") + Untranslated(" ") + error;
             return nullptr;
         }
 
         std::shared_ptr<CWallet> wallet = CWallet::CreateWalletFromFile(chain, location, error, warnings);
         if (!wallet) {
-            error = Untranslated("Wallet loading failed: ") + error;
+            error = Untranslated("Wallet loading failed.") + Untranslated(" ") + error;
             return nullptr;
         }
         AddWallet(wallet);
diff --git a/test/functional/wallet_bumpfee.py b/test/functional/wallet_bumpfee.py
@@ -300,7 +300,7 @@ def test_maxtxfee_fails(self, rbf_node, dest_address):
     self.restart_node(1, ['-maxtxfee=0.000025'] + self.extra_args[1])
     rbf_node.walletpassphrase(WALLET_PASSPHRASE, WALLET_PASSPHRASE_TIMEOUT)
     rbfid = spend_one_input(rbf_node, dest_address)
-    assert_raises_rpc_error(-4, "Unable to create transaction: Fee exceeds maximum configured by -maxtxfee", rbf_node.bumpfee, rbfid)
+    assert_raises_rpc_error(-4, "Unable to create transaction. Fee exceeds maximum configured by -maxtxfee", rbf_node.bumpfee, rbfid)
     self.restart_node(1, self.extra_args[1])
     rbf_node.walletpassphrase(WALLET_PASSPHRASE, WALLET_PASSPHRASE_TIMEOUT)
 
@@ -517,7 +517,7 @@ def test_no_more_inputs_fails(self, rbf_node, dest_address):
     rbf_node.generatetoaddress(1, dest_address)
     # spend all funds, no change output
     rbfid = rbf_node.sendtoaddress(rbf_node.getnewaddress(), rbf_node.getbalance(), "", "", True)
-    assert_raises_rpc_error(-4, "Unable to create transaction: Insufficient funds", rbf_node.bumpfee, rbfid)
+    assert_raises_rpc_error(-4, "Unable to create transaction. Insufficient funds", rbf_node.bumpfee, rbfid)
 
 
 if __name__ == "__main__":
diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py
@@ -227,10 +227,10 @@ def wallet_file(name):
         assert_raises_rpc_error(-18, 'Wallet wallets not found.', self.nodes[0].loadwallet, 'wallets')
 
         # Fail to load duplicate wallets
-        assert_raises_rpc_error(-4, 'Wallet file verification failed: Error loading wallet w1. Duplicate -wallet filename specified.', self.nodes[0].loadwallet, wallet_names[0])
+        assert_raises_rpc_error(-4, 'Wallet file verification failed. Error loading wallet w1. Duplicate -wallet filename specified.', self.nodes[0].loadwallet, wallet_names[0])
 
         # Fail to load duplicate wallets by different ways (directory and filepath)
-        assert_raises_rpc_error(-4, "Wallet file verification failed: Error loading wallet wallet.dat. Duplicate -wallet filename specified.", self.nodes[0].loadwallet, 'wallet.dat')
+        assert_raises_rpc_error(-4, "Wallet file verification failed. Error loading wallet wallet.dat. Duplicate -wallet filename specified.", self.nodes[0].loadwallet, 'wallet.dat')
 
         # Fail to load if one wallet is a copy of another
         assert_raises_rpc_error(-4, "BerkeleyBatch: Can't open database w8_copy (duplicates fileid", self.nodes[0].loadwallet, 'w8_copy')
@@ -240,7 +240,7 @@ def wallet_file(name):
 
 
         # Fail to load if wallet file is a symlink
-        assert_raises_rpc_error(-4, "Wallet file verification failed: Invalid -wallet path 'w8_symlink'", self.nodes[0].loadwallet, 'w8_symlink')
+        assert_raises_rpc_error(-4, "Wallet file verification failed. Invalid -wallet path 'w8_symlink'", self.nodes[0].loadwallet, 'w8_symlink')
 
         # Fail to load if a directory is specified that doesn't contain a wallet
         os.mkdir(wallet_dir('empty_wallet_dir'))

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ Result CreateRateBumpTransaction(CWallet& wallet, const uint256& txid, const CCo`
`220`	`220`	`int change_pos_in_out = -1; // No requested location for change`
`221`	`221`	`bilingual_str fail_reason;`
`222`	`222`	`if (!wallet.CreateTransaction(recipients, tx_new, fee_ret, change_pos_in_out, fail_reason, new_coin_control, false)) {`
`223`		`- errors.push_back(Untranslated("Unable to create transaction: ") + Untranslated(" ") + fail_reason);`
	`223`	`+ errors.push_back(Untranslated("Unable to create transaction.") + Untranslated(" ") + fail_reason);`
`224`	`224`	`return Result::WALLET_ERROR;`
`225`	`225`	`}`
`226`	`226`
Original file line number	Diff line number	Diff line change
`@@ -154,13 +154,13 @@ std::shared_ptr<CWallet> LoadWallet(interfaces::Chain& chain, const WalletLocati`
`154`	`154`	`{`
`155`	`155`	`try {`
`156`	`156`	`if (!CWallet::Verify(chain, location, false, error, warnings)) {`
`157`		`- error = Untranslated("Wallet file verification failed: ") + error;`
	`157`	`+ error = Untranslated("Wallet file verification failed.") + Untranslated(" ") + error;`
`158`	`158`	`return nullptr;`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`std::shared_ptr<CWallet> wallet = CWallet::CreateWalletFromFile(chain, location, error, warnings);`
`162`	`162`	`if (!wallet) {`
`163`		`- error = Untranslated("Wallet loading failed: ") + error;`
	`163`	`+ error = Untranslated("Wallet loading failed.") + Untranslated(" ") + error;`
`164`	`164`	`return nullptr;`
`165`	`165`	`}`
`166`	`166`	`AddWallet(wallet);`