-
Notifications
You must be signed in to change notification settings - Fork 35.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
When encrypting the wallet, warn user that he should make new backups. A fix for Issue #1884. #1890
Conversation
Idea is a good one, what I would love to see is avoid HTML-format tags in strings we use in translations. This is not always possible, but I would split that mega string into smaller pieces and use e.g. Edit: What does the |
No comment on the message, though I'd indeed suggest splitting it over multiple lines in the source code for readability. The |
Good point about HTML in translation strings. I've removed the tags from the strings in tr(). And also made it somewhat more readable. I'm wondering if we should include a more detailed description in the message, as previous backups don't exactly become useless as soon as the wallet is encrypted. Only when the user starts sending transactions, and the change is received by the encrypted addresses. But I figure it might just be better to not include that technicality. |
@@ -108,7 +108,16 @@ void AskPassphraseDialog::accept() | |||
if(model->setWalletEncrypted(true, newpass1)) | |||
{ | |||
QMessageBox::warning(this, tr("Wallet encrypted"), | |||
tr("Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.")); | |||
"<qt>" + | |||
tr("Bitcoin will close now to finish the encryption process. \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Personally I'd use this syntax to spread the message over multiple lines, ie surround every line with "
:
tr("Bitcoin will close now to finish the encryption process. "
"Remember that encrypting your wallet cannot fully protect "
"..."
...)
With the current way, all the indentation whitespace ends up in the translation string.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right. That does look better. I didn't know tr() accepts multiple arguments like that.
ACK, please squash into one commit |
…eless. Don't include HTML in translation strings. Do split the huge message over several lines. Prettier lines
Automatic sanity-testing: FAILED BUILD/TEST, see http://jenkins.bluematt.me/pull-tester/1bf66fcc0aaf0bd12bbb1d1026d52b6388033d38 for binaries and test log. This could happen for one of several reasons:
|
Cool that we have an automatic build and test bot! I don't quite get the error though:
since this patch doesn't touch main.cpp. |
…o IsSolvable b425466 [Script] Add fColdStaking bool to IsSolvable (random-zebra) Pull request description: Fixing a minor bug introduced in bitcoin#1757. `IsSolvable` always tries to produce a signature with the owner key, so it logs an error (and reports the coin as not solvable) for cold stakers. Fix it introducing a boolean argument in `IsSolvable`, to check the appropriate public key in the keystore. ACKs for top commit: furszy: Great catch 👌 , ACK b425466 Fuzzbawls: ACK b425466 Tree-SHA512: 9d4537218344c8176f1de500664905e78419fd852c9607b40cf83eedb55e5fb965977f31bba0a605fac35c9bee373613467d63c6d3f72386c598e7452b545101
No description provided.