Line-wrap privacy notice. Use <> around URL and end sentence with '.'.

Include privacy notice in help text for zcashd -help.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

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] <command> [params]  " + _("Send command to Zcash") + "\n" +
                   "  zcash-cli [options] help                " + _("List commands") + "\n" +

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"))
         {

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;
     }
 

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" +

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();