diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2019-06-17 10:56:52 +0300 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2019-07-24 16:32:53 +0300 |
| commit | 0b86e517ad733c8740c519332aa4c0e9035dbaab (patch) | |
| tree | b2e0e4ed7b07400231d9323419b0e8eeb3576490 /src/util | |
| parent | 0626b8cbdf0aa971500eb5613c7ab4096c496966 (diff) | |
Refactor out translation.h
This is a prerequisite for introducing bilingual error messages.
Note: #includes are arranged by clang-format-diff.py script.
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/error.cpp | 2 | ||||
| -rw-r--r-- | src/util/system.cpp | 1 | ||||
| -rw-r--r-- | src/util/system.h | 12 | ||||
| -rw-r--r-- | src/util/translation.h | 20 |
4 files changed, 23 insertions, 12 deletions
diff --git a/src/util/error.cpp b/src/util/error.cpp index 9331a92ad7..1b662d3700 100644 --- a/src/util/error.cpp +++ b/src/util/error.cpp @@ -4,7 +4,9 @@ #include <util/error.h> +#include <tinyformat.h> #include <util/system.h> +#include <util/translation.h> std::string TransactionErrorString(const TransactionError err) { diff --git a/src/util/system.cpp b/src/util/system.cpp index 72b37b9187..2a069c554f 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -7,6 +7,7 @@ #include <chainparamsbase.h> #include <util/strencodings.h> +#include <util/translation.h> #include <stdarg.h> diff --git a/src/util/system.h b/src/util/system.h index dda9156488..66a9eb4612 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -40,18 +40,6 @@ int64_t GetStartupTime(); extern const char * const BITCOIN_CONF_FILENAME; -/** Translate a message to the native language of the user. */ -const extern std::function<std::string(const char*)> G_TRANSLATION_FUN; - -/** - * Translation function. - * If no translation function is set, simply return the input. - */ -inline std::string _(const char* psz) -{ - return G_TRANSLATION_FUN ? (G_TRANSLATION_FUN)(psz) : psz; -} - void SetupEnvironment(); bool SetupNetworking(); diff --git a/src/util/translation.h b/src/util/translation.h new file mode 100644 index 0000000000..d709b26890 --- /dev/null +++ b/src/util/translation.h @@ -0,0 +1,20 @@ +// Copyright (c) 2019 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_UTIL_TRANSLATION_H +#define BITCOIN_UTIL_TRANSLATION_H + +/** Translate a message to the native language of the user. */ +const extern std::function<std::string(const char*)> G_TRANSLATION_FUN; + +/** + * Translation function. + * If no translation function is set, simply return the input. + */ +inline std::string _(const char* psz) +{ + return G_TRANSLATION_FUN ? (G_TRANSLATION_FUN)(psz) : psz; +} + +#endif // BITCOIN_UTIL_TRANSLATION_H |