diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-06-27 15:07:17 -0400 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-09-24 07:53:28 +0800 |
| commit | 9d389d09ed5db1a2dda00ba999b02d38186b6af4 (patch) | |
| tree | 46db7e67782823fe1c1b2e8515eaf3a73899c3d8 | |
| parent | 87908e9c98f2bc6975d70d8f427a9be965effc3b (diff) | |
util: No translation of `Bitcoin Core` in the copyright
Github-Pull: #16291
Rebased-From: fa64b947bb3075ff8737656706b941af691908ab
| -rw-r--r-- | src/util/system.cpp | 7 | ||||
| -rwxr-xr-x | test/lint/lint-format-strings.py | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/util/system.cpp b/src/util/system.cpp index 7ccb9ef9e7..caa65f59ef 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -1205,10 +1205,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 index f5d4780b6d..21246b687e 100755 --- a/test/lint/lint-format-strings.py +++ b/test/lint/lint-format-strings.py @@ -16,8 +16,7 @@ FALSE_POSITIVES = [ ("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)"), |