diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index a023daef6..6d775f453 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -64,10 +64,8 @@ static bool AppInitRPC(int argc, char* argv[]) // ParseParameters(argc, argv); if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) { - std::string strUsage = _("Zcash RPC client version") + " " + FormatFullVersion() + "\n"; + std::string strUsage = _("Zcash RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); if (!mapArgs.count("-version")) { - strUsage += "\n" + strprintf(_("In order to ensure you are adequately protecting your privacy when using Zcash, please see %s"), "https://z.cash/support/security/index.html") + "\n"; - strUsage += "\n" + _("Usage:") + "\n" + " zcash-cli [options] [params] " + _("Send command to Zcash") + "\n" + " zcash-cli [options] help " + _("List commands") + "\n" + diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 2063f4c85..502cef6ac 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -68,7 +68,7 @@ bool AppInit(int argc, char* argv[]) // Process help and version before taking care about datadir if (mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) { - std::string strUsage = _("Zcash Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n"; + std::string strUsage = _("Zcash Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); if (mapArgs.count("-version")) { diff --git a/src/metrics.cpp b/src/metrics.cpp index 5bce5cf6f..6096848e1 100644 --- a/src/metrics.cpp +++ b/src/metrics.cpp @@ -331,9 +331,8 @@ void ThreadShowMetricsScreen() std::cout << _("Thank you for running a Zcash node!") << std::endl; std::cout << _("You're helping to strengthen the network and contributing to a social good :)") << std::endl; - // Security warning text - std::cout << std::endl; - std::cout << strprintf(_("In order to ensure you are adequately protecting your privacy when using Zcash, please see %s"), "https://z.cash/support/security/index.html") << std::endl; + // Privacy notice text + std::cout << PrivacyInfo(); std::cout << std::endl; } diff --git a/src/util.cpp b/src/util.cpp index e89a1c434..fe0f2e12a 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -876,9 +876,16 @@ void SetThreadPriority(int nPriority) #endif // WIN32 } +std::string PrivacyInfo() +{ + return "\n" + + FormatParagraph(strprintf(_("In order to ensure you are adequately protecting your privacy when using Zcash, please see <%s>."), + "https://z.cash/support/security/index.html")) + "\n"; +} + std::string LicenseInfo() { - return "\n" + FormatParagraph(strprintf(_("In order to ensure you are adequately protecting your privacy when using Zcash, please see %s"), "https://z.cash/support/security/index.html")) + "\n" + "\n" + + return "\n" + FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + FormatParagraph(strprintf(_("Copyright (C) 2015-%i The Zcash Developers"), COPYRIGHT_YEAR)) + "\n" + "\n" + diff --git a/src/util.h b/src/util.h index e4eea2ba1..902d42166 100644 --- a/src/util.h +++ b/src/util.h @@ -141,6 +141,9 @@ void ShrinkDebugFile(); void runCommand(const std::string& strCommand); const boost::filesystem::path GetExportDir(); +/** Returns privacy notice (for -version, -help and metrics screen) */ +std::string PrivacyInfo(); + /** Returns licensing information (for -version) */ std::string LicenseInfo();