From ab1d2d575c40fd15748ef87cfc21d06d5917f4e1 Mon Sep 17 00:00:00 2001 From: Jay Graber Date: Fri, 24 Mar 2017 13:48:27 -0700 Subject: [PATCH] Add security message to license text, rm url from translation string --- src/bitcoin-cli.cpp | 3 ++- src/metrics.cpp | 2 +- src/util.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 52f4be4e4..a023daef6 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -65,8 +65,9 @@ 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"; - strUsage += "\n" + _("In order to ensure you are adequately protecting your privacy when using Zcash, please see https://z.cash/support/security/index.html") + "\n"; 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/metrics.cpp b/src/metrics.cpp index fda94788e..5bce5cf6f 100644 --- a/src/metrics.cpp +++ b/src/metrics.cpp @@ -333,7 +333,7 @@ void ThreadShowMetricsScreen() // Security warning text std::cout << std::endl; - std::cout << _("In order to ensure you are adequately protecting your privacy when using Zcash, please see https://z.cash/support/security/index.html") << 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; std::cout << std::endl; } diff --git a/src/util.cpp b/src/util.cpp index 8ce727609..e89a1c434 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -878,7 +878,8 @@ void SetThreadPriority(int nPriority) std::string LicenseInfo() { - return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + + 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" + + 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" + FormatParagraph(_("This is experimental software.")) + "\n" +