util: No translation of Bitcoin Core in the copyright

MarcoFalke · MarcoFalke · commit fa64b947bb30 · 2019-06-27T15:06:46.000-04:00
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -1188,10 +1188,11 @@ int GetNumCores()
 
 std::string CopyrightHolders(const std::string& strPrefix)
 {
-    std::string strCopyrightHolders = strPrefix + strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION));
+    const auto copyright_devs = strprintf(_(COPYRIGHT_HOLDERS), COPYRIGHT_HOLDERS_SUBSTITUTION);
+    std::string strCopyrightHolders = strPrefix + copyright_devs;
 
-    // Check for untranslated substitution to make sure Bitcoin Core copyright is not removed by accident
-    if (strprintf(COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION).find("Bitcoin Core") == std::string::npos) {
+    // Make sure Bitcoin Core copyright is not removed by accident
+    if (copyright_devs.find("Bitcoin Core") == std::string::npos) {
         strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers";
     }
     return strCopyrightHolders;
diff --git a/test/lint/lint-format-strings.py b/test/lint/lint-format-strings.py
@@ -16,8 +16,7 @@
     ("src/dbwrapper.cpp", "vsnprintf(p, limit - p, format, backup_ap)"),
     ("src/index/base.cpp", "FatalError(const char* fmt, const Args&... args)"),
     ("src/netbase.cpp", "LogConnectFailure(bool manual_connection, const char* fmt, const Args&... args)"),
-    ("src/util/system.cpp", "strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION))"),
-    ("src/util/system.cpp", "strprintf(COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION)"),
+    ("src/util/system.cpp", "strprintf(_(COPYRIGHT_HOLDERS), COPYRIGHT_HOLDERS_SUBSTITUTION)"),
     ("src/wallet/wallet.h",  "WalletLogPrintf(std::string fmt, Params... parameters)"),
     ("src/wallet/wallet.h", "LogPrintf((\"%s \" + fmt).c_str(), GetDisplayName(), parameters...)"),
     ("src/logging.h", "LogPrintf(const char* fmt, const Args&... args)"),

Original file line number	Diff line number	Diff line change
`@@ -1188,10 +1188,11 @@ int GetNumCores()`
`1188`	`1188`
`1189`	`1189`	`std::string CopyrightHolders(const std::string& strPrefix)`
`1190`	`1190`	`{`
`1191`		`- std::string strCopyrightHolders = strPrefix + strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION));`
	`1191`	`+ const auto copyright_devs = strprintf(_(COPYRIGHT_HOLDERS), COPYRIGHT_HOLDERS_SUBSTITUTION);`
	`1192`	`+ std::string strCopyrightHolders = strPrefix + copyright_devs;`
`1192`	`1193`
`1193`		`- // Check for untranslated substitution to make sure Bitcoin Core copyright is not removed by accident`
`1194`		`- if (strprintf(COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION).find("Bitcoin Core") == std::string::npos) {`
	`1194`	`+ // Make sure Bitcoin Core copyright is not removed by accident`
	`1195`	`+ if (copyright_devs.find("Bitcoin Core") == std::string::npos) {`
`1195`	`1196`	`strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers";`
`1196`	`1197`	`}`
`1197`	`1198`	`return strCopyrightHolders;`