diff options
| author | MarcoFalke <[email protected]> | 2016-06-29 23:38:33 +0200 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2016-07-02 10:46:26 +0200 |
| commit | 33336e1aacb36607d0950d681d8e24821e64f8df (patch) | |
| tree | f90cbcb41ba530560857bfd2b80eeadfda27a1a7 /src/util.cpp | |
| parent | Merge #8261: The bit field is shown only when status is "started" (diff) | |
| download | discoin-33336e1aacb36607d0950d681d8e24821e64f8df.tar.xz discoin-33336e1aacb36607d0950d681d8e24821e64f8df.zip | |
[util] CopyrightHolders: Check for untranslated substitution
Also, remove check which is always true
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/util.cpp b/src/util.cpp index 9a9209c62..ee12f2b44 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -801,11 +801,10 @@ int GetNumCores() std::string CopyrightHolders(const std::string& strPrefix) { - std::string strCopyrightHolders = strPrefix + _(COPYRIGHT_HOLDERS); - if (strCopyrightHolders.find("%s") != strCopyrightHolders.npos) { - strCopyrightHolders = strprintf(strCopyrightHolders, _(COPYRIGHT_HOLDERS_SUBSTITUTION)); - } - if (strCopyrightHolders.find("Bitcoin Core developers") == strCopyrightHolders.npos) { + std::string strCopyrightHolders = strPrefix + strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION)); + + // 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) { strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers"; } return strCopyrightHolders; |