From b0d1ed8304f010de7980f86fd64565a570f4e46c Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Mon, 24 Oct 2016 22:33:13 +0200 Subject: [PATCH] Make clear that address error message refer to the recipient - a user report indicated there is confusion about address error messages. He/she thought it refers to the sender address, however it refers to the recipient address. This makes it more clear --- src/bitmessageqt/__init__.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 0eff7123..d44d54d8 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -2005,36 +2005,36 @@ class MyForm(settingsmixin.SMainWindow): status, addressVersionNumber, streamNumber, ripe = decodeAddress( toAddress) if status != 'success': - logger.error('Error: Could not decode ' + toAddress + ':' + status) try: toAddress = unicode(toAddress, 'utf-8', 'ingore') except: pass + logger.error('Error: Could not decode recipient address ' + toAddress + ':' + status) if status == 'missingbm': self.statusBar().showMessage(_translate( - "MainWindow", "Error: Bitmessage addresses start with BM- Please check %1").arg(toAddress), 10000) + "MainWindow", "Error: Bitmessage addresses start with BM- Please check the recipient address %1").arg(toAddress), 10000) elif status == 'checksumfailed': self.statusBar().showMessage(_translate( - "MainWindow", "Error: The address %1 is not typed or copied correctly. Please check it.").arg(toAddress), 10000) + "MainWindow", "Error: The recipient address %1 is not typed or copied correctly. Please check it.").arg(toAddress), 10000) elif status == 'invalidcharacters': self.statusBar().showMessage(_translate( - "MainWindow", "Error: The address %1 contains invalid characters. Please check it.").arg(toAddress), 10000) + "MainWindow", "Error: The recipient address %1 contains invalid characters. Please check it.").arg(toAddress), 10000) elif status == 'versiontoohigh': self.statusBar().showMessage(_translate( - "MainWindow", "Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever.").arg(toAddress), 10000) + "MainWindow", "Error: The version of the recipient address %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever.").arg(toAddress), 10000) elif status == 'ripetooshort': self.statusBar().showMessage(_translate( - "MainWindow", "Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance.").arg(toAddress), 10000) + "MainWindow", "Error: Some data encoded in the recipient address %1 is too short. There might be something wrong with the software of your acquaintance.").arg(toAddress), 10000) elif status == 'ripetoolong': self.statusBar().showMessage(_translate( - "MainWindow", "Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance.").arg(toAddress), 10000) + "MainWindow", "Error: Some data encoded in the recipient address %1 is too long. There might be something wrong with the software of your acquaintance.").arg(toAddress), 10000) elif status == 'varintmalformed': self.statusBar().showMessage(_translate( - "MainWindow", "Error: Some data encoded in the address %1 is malformed. There might be something wrong with the software of your acquaintance.").arg(toAddress), 10000) + "MainWindow", "Error: Some data encoded in the recipient address %1 is malformed. There might be something wrong with the software of your acquaintance.").arg(toAddress), 10000) else: self.statusBar().showMessage(_translate( - "MainWindow", "Error: Something is wrong with the address %1.").arg(toAddress), 10000) + "MainWindow", "Error: Something is wrong with the recipient address %1.").arg(toAddress), 10000) elif fromAddress == '': self.statusBar().showMessage(_translate( "MainWindow", "Error: You must specify a From address. If you don\'t have one, go to the \'Your Identities\' tab."), 10000)