1 files changed, 31 insertions, 26 deletions

diff --git a/src/warnings.cpp b/src/warnings.cpp
index 467c3d0f65..501bf7e637 100644
--- a/src/warnings.cpp
+++ b/src/warnings.cpp
@@ -6,66 +6,71 @@
 #include <warnings.h>
 
 #include <sync.h>
+#include <util/string.h>
 #include <util/system.h>
 #include <util/translation.h>
 
-static RecursiveMutex cs_warnings;
-static std::string strMiscWarning GUARDED_BY(cs_warnings);
-static bool fLargeWorkForkFound GUARDED_BY(cs_warnings) = false;
-static bool fLargeWorkInvalidChainFound GUARDED_BY(cs_warnings) = false;
+#include <vector>
 
-void SetMiscWarning(const std::string& strWarning)
+static Mutex g_warnings_mutex;
+static bilingual_str g_misc_warnings GUARDED_BY(g_warnings_mutex);
+static bool fLargeWorkForkFound GUARDED_BY(g_warnings_mutex) = false;
+static bool fLargeWorkInvalidChainFound GUARDED_BY(g_warnings_mutex) = false;
+
+void SetMiscWarning(const bilingual_str& warning)
 {
-    LOCK(cs_warnings);
-    strMiscWarning = strWarning;
+    LOCK(g_warnings_mutex);
+    g_misc_warnings = warning;
 }
 
 void SetfLargeWorkForkFound(bool flag)
 {
-    LOCK(cs_warnings);
+    LOCK(g_warnings_mutex);
     fLargeWorkForkFound = flag;
 }
 
 bool GetfLargeWorkForkFound()
 {
-    LOCK(cs_warnings);
+    LOCK(g_warnings_mutex);
     return fLargeWorkForkFound;
 }
 
 void SetfLargeWorkInvalidChainFound(bool flag)
 {
-    LOCK(cs_warnings);
+    LOCK(g_warnings_mutex);
     fLargeWorkInvalidChainFound = flag;
 }
 
-std::string GetWarnings(bool verbose)
+bilingual_str GetWarnings(bool verbose)
 {
-    std::string warnings_concise;
-    std::string warnings_verbose;
-    const std::string warning_separator = "<hr />";
+    bilingual_str warnings_concise;
+    std::vector<bilingual_str> warnings_verbose;
 
-    LOCK(cs_warnings);
+    LOCK(g_warnings_mutex);
 
     // Pre-release build warning
     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_verbose = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications").translated;
+        warnings_concise = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications");
+        warnings_verbose.emplace_back(warnings_concise);
     }
 
     // Misc warnings like out of disk space and clock is wrong
-    if (strMiscWarning != "") {
-        warnings_concise = strMiscWarning;
-        warnings_verbose += (warnings_verbose.empty() ? "" : warning_separator) + strMiscWarning;
+    if (!g_misc_warnings.empty()) {
+        warnings_concise = g_misc_warnings;
+        warnings_verbose.emplace_back(warnings_concise);
     }
 
     if (fLargeWorkForkFound) {
-        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_concise = _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
+        warnings_verbose.emplace_back(warnings_concise);
     } 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_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_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.emplace_back(warnings_concise);
+    }
+
+    if (verbose) {
+        return Join(warnings_verbose, Untranslated("<hr />"));
     }
 
-    if (verbose) return warnings_verbose;
-    else return warnings_concise;
+    return warnings_concise;
 }