diff options
| author | MarcoFalke <[email protected]> | 2019-07-24 14:06:59 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2019-07-24 14:07:05 -0400 |
| commit | d960d5ca99b7ba12f9c1e9042b5e9ac3fcf86473 (patch) | |
| tree | 9efb597566399ccb2bd3d44ad6add039e66a353a /src/bitcoin-cli.cpp | |
| parent | Merge #16445: test: Skip flaky p2p_invalid_messages test on macOS (diff) | |
| parent | scripted-diff: Make translation bilingual (diff) | |
| download | discoin-d960d5ca99b7ba12f9c1e9042b5e9ac3fcf86473.tar.xz discoin-d960d5ca99b7ba12f9c1e9042b5e9ac3fcf86473.zip | |
Merge #16362: Add bilingual_str type
753f7cccce83084f4b18cf4bdf3225183179508c scripted-diff: Make translation bilingual (Hennadii Stepanov)
7c45e14f2f682eddcc853c0f6051c7c8c6387289 Add bilingual message type (Hennadii Stepanov)
0b86e517ad733c8740c519332aa4c0e9035dbaab Refactor out translation.h (Hennadii Stepanov)
Pull request description:
This PR adds the `bilingual_str` struct and a `strprintf` overload:
https://github.com/bitcoin/bitcoin/blob/0626b8cbdf0aa971500eb5613c7ab4096c496966/src/tinyformat.h#L1066-L1067
Both new features allow bitcoin code to easily send dual translated and non-translated messages to the GUI and the logging framework.
This PR is only a refactoring (has been split off the #16224 (see: https://github.com/bitcoin/bitcoin/pull/16224/#issuecomment-509718579)) and does not change behavior.
ACKs for top commit:
MarcoFalke:
ACK 753f7cccce
ryanofsky:
utACK 753f7cccce83084f4b18cf4bdf3225183179508c. Only change since last review is fixing lint error (double includes)
Tree-SHA512: 52b0654421d558e4775c0484d78be26319fe3db5118af9b0a9bdfbdaad53a3704f527a5d5aba1013a64560b9b6a0c3c4cf0a6782e49aa731e18d99de95220385
Diffstat (limited to 'src/bitcoin-cli.cpp')
| -rw-r--r-- | src/bitcoin-cli.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index d3419520a..8ca985458 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -13,9 +13,11 @@ #include <rpc/client.h> #include <rpc/protocol.h> #include <rpc/request.h> -#include <util/system.h> #include <util/strencodings.h> +#include <util/system.h> +#include <util/translation.h> +#include <functional> #include <memory> #include <stdio.h> #include <tuple> |