wallet: Avoid translating RPC errors #18699
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maflcko
force-pushed
the
1908-walletErrorSegfault
branch
from
fa9da10
to
fa5f2e2
Compare
|
Can be tested with: The gui popups should be translated, but the json rpc errors should not. |
|
Concept ACK. |
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
maflcko
force-pushed
the
1908-walletErrorSegfault
branch
from
fa5f2e2
to
fa97ee5
Compare
This was referenced Apr 18, 2020
maflcko
force-pushed
the
1908-walletErrorSegfault
branch
from
fa97ee5
to
fa5ba7e
Compare
This was referenced Apr 20, 2020
maflcko
force-pushed
the
1908-walletErrorSegfault
branch
from
facfe27
to
fa4de54
Compare
This was referenced Apr 27, 2020
|
Ok, I marked everything that wasn't translated before as |
maflcko
force-pushed
the
1908-walletErrorSegfault
branch
from
fa4de54
to
faecd36
Compare
This was referenced Apr 30, 2020
added 4 commits
May 1, 2020 07:39
Common errors and warnings should be translated when displayed in the GUI, but not translated when displayed elsewhere. The wallet method CreateWalletFromFile does not know its caller, so this commit changes it to return a bilingual_str to the caller.
Also, mark feebumper bilingual_str as Untranslated They are technical and have previously not been translated either. It is questionable whether they can even appear in the GUI.
If the potential translation strings are translated in the future, trailing whitespace is going to make translation effort harder.
maflcko
force-pushed
the
1908-walletErrorSegfault
branch
from
faecd36
to
fa2cce4
Compare
|
Rebased |
|
Can also be verified with |
|
ACK fa2cce4, checked that no new translation messages are added compared to master. |
hebasto
reviewed
May 4, 2020
Comment on lines
+28
to
+33
| /** Mark a bilingual_str as untranslated */ | ||
| inline static bilingual_str Untranslated(std::string original) { return {original, original}; } | ||
| /** Unary operator to return the original */ | ||
| inline static std::string OpOriginal(const bilingual_str& b) { return b.original; } | ||
| /** Unary operator to return the translation */ | ||
| inline static std::string OpTranslated(const bilingual_str& b) { return b.translated; } |
There was a problem hiding this comment.
@MarcoFalke What is the rationale to declare these functions with static?
There was a problem hiding this comment.
I think this is a leftover. They only need to be inline to avoid linker errors. static might have no effect.
There was a problem hiding this comment.
Feel free to remove in your pull
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
May 4, 2020
fa2cce4 wallet: Remove trailing whitespace from potential translation strings (MarcoFalke) fa59cc1 wallet: Report full error message in wallettool (MarcoFalke) fae7776 wallet: Avoid translating RPC errors when creating txs (MarcoFalke) fae51a5 wallet: Avoid translating RPC errors when loading wallets (MarcoFalke) Pull request description: Common errors and warnings should be translated when displayed in the GUI, but not translated when displayed elsewhere. The wallet method `CreateWalletFromFile` does not know its caller, so this commit changes it to return a `bilingual_str` to the caller. Fixes bitcoin#17072 ACKs for top commit: laanwj: ACK fa2cce4, checked that no new translation messages are added compared to master. hebasto: ACK fa2cce4 Tree-SHA512: c6a943ae9c3689ea3c48c20d26de6e4970de0257a1f1eec57a2bded67a4af9dcc5c45b2d64659d6fb4c4bc4d8103e28483ea3d14bb850df8db0ff9e8e5c77ee2
jasonbcox
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Oct 1, 2020
Summary: Common errors and warnings should be translated when displayed in the GUI, but not translated when displayed elsewhere. The wallet method CreateWalletFromFile does not know its caller, so this commit changes it to return a bilingual_str to the caller. This is a partial backport of Core [[bitcoin/bitcoin#18699 | PR18699]] : bitcoin/bitcoin@fae51a5 Depends on D7699 Test Plan: ninja all check-all Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Subscribers: Fabien Differential Revision: https://reviews.bitcoinabc.org/D7701
jasonbcox
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Oct 1, 2020
Summary: Also, mark feebumper bilingual_str as Untranslated They are technical and have previously not been translated either. It is questionable whether they can even appear in the GUI. This is a partial backport of Cor [[bitcoin/bitcoin#18699 | PR18699]] : bitcoin/bitcoin@fae7776 Test Plan: ninja all check Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Differential Revision: https://reviews.bitcoinabc.org/D7703
jasonbcox
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Oct 1, 2020
Summary: this is a partial backport of Core [[bitcoin/bitcoin#18699 | PR18699]] Depends on D7703 and D7706 Test Plan: ninja all check-all Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Differential Revision: https://reviews.bitcoinabc.org/D7707
jasonbcox
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Oct 1, 2020
Summary: If the potential translation strings are translated in the future, trailing whitespace is going to make translation effort harder. This is the final part of Core [[bitcoin/bitcoin#18699 | PR18699]] : bitcoin/bitcoin@fa2cce4 Depends on D7707 Test Plan: ninja all check-all Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Differential Revision: https://reviews.bitcoinabc.org/D7708
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Common errors and warnings should be translated when displayed in the
GUI, but not translated when displayed elsewhere. The wallet method
CreateWalletFromFiledoes not know its caller, so this commit changes itto return a
bilingual_strto the caller.Fixes #17072