foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-03 09:56:38 -05:00
Code Issues Activity

refactor: Make GetWarnings() bilingual_str aware internally

Browse source
This commit is contained in:
Hennadii Stepanov 2020-06-10 11:21:40 +03:00
parent 20e9531379
commit 38e33aa481
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/warnings.cpp
View file

@ -6,9 +6,12 @@
#include <warnings.h> #include <warnings.h>
#include <sync.h> #include <sync.h>
#include <util/string.h>
#include <util/system.h> #include <util/system.h>
#include <util/translation.h> #include <util/translation.h>
#include <vector>
static Mutex g_warnings_mutex; static Mutex g_warnings_mutex;
static std::string strMiscWarning GUARDED_BY(g_warnings_mutex); static std::string strMiscWarning GUARDED_BY(g_warnings_mutex);
static bool fLargeWorkForkFound GUARDED_BY(g_warnings_mutex) = false; static bool fLargeWorkForkFound GUARDED_BY(g_warnings_mutex) = false;
@ -40,32 +43,34 @@ void SetfLargeWorkInvalidChainFound(bool flag)
std::string GetWarnings(bool verbose) std::string GetWarnings(bool verbose)
{ {
std::string warnings_concise; bilingual_str warnings_concise;
std::string warnings_verbose; std::vector<bilingual_str> warnings_verbose;
const std::string warning_separator = "<hr />";
LOCK(g_warnings_mutex); LOCK(g_warnings_mutex);
// Pre-release build warning // Pre-release build warning
if (!CLIENT_VERSION_IS_RELEASE) { if (!CLIENT_VERSION_IS_RELEASE) {
warnings_concise = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications"; warnings_concise = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications");
warnings_verbose = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications").translated; warnings_verbose.emplace_back(warnings_concise);
} }
// Misc warnings like out of disk space and clock is wrong // Misc warnings like out of disk space and clock is wrong
if (strMiscWarning != "") { if (!strMiscWarning.empty()) {
warnings_concise = strMiscWarning; warnings_concise = Untranslated(strMiscWarning);
warnings_verbose += (warnings_verbose.empty() ? "" : warning_separator) + strMiscWarning; warnings_verbose.emplace_back(warnings_concise);
} }
if (fLargeWorkForkFound) { if (fLargeWorkForkFound) {
warnings_concise = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues."; warnings_concise = _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
warnings_verbose += (warnings_verbose.empty() ? "" : warning_separator) + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.").translated; warnings_verbose.emplace_back(warnings_concise);
} else if (fLargeWorkInvalidChainFound) { } else if (fLargeWorkInvalidChainFound) {
warnings_concise = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade."; warnings_concise = _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
warnings_verbose += (warnings_verbose.empty() ? "" : warning_separator) + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.").translated; warnings_verbose.emplace_back(warnings_concise);
} }
if (verbose) return warnings_verbose; if (verbose) {
else return warnings_concise; return Join(warnings_verbose, Untranslated("<hr />")).translated;
}
return warnings_concise.original;
} }