phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-09 19:37:27 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: Pick translated string after format

Browse source 
This passes the return value of _() directly to strprintf so the format
string can be checked at compile time in a future commit.
This commit is contained in:
MarcoFalke 2024-10-09 11:48:14 +02:00
parent ccc2d3abcd
commit faff8403f0
No known key found for this signature in database
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/clientversion.cpp
View file

@ -71,7 +71,7 @@ std::string FormatSubVersion(const std::string& name, int nClientVersion, const
std::string CopyrightHolders(const std::string& strPrefix) std::string CopyrightHolders(const std::string& strPrefix)
{ {
const auto copyright_devs = strprintf(_(COPYRIGHT_HOLDERS).translated, COPYRIGHT_HOLDERS_SUBSTITUTION); const auto copyright_devs = strprintf(_(COPYRIGHT_HOLDERS), COPYRIGHT_HOLDERS_SUBSTITUTION).translated;
std::string strCopyrightHolders = strPrefix + copyright_devs; std::string strCopyrightHolders = strPrefix + copyright_devs;
// Make sure Bitcoin Core copyright is not removed by accident // Make sure Bitcoin Core copyright is not removed by accident
@ -85,15 +85,17 @@ std::string LicenseInfo()
{ {
const std::string URL_SOURCE_CODE = "<https://github.com/bitcoin/bitcoin>"; const std::string URL_SOURCE_CODE = "<https://github.com/bitcoin/bitcoin>";
return CopyrightHolders(strprintf(_("Copyright (C) %i-%i").translated, 2009, COPYRIGHT_YEAR) + " ") + "\n" + return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2009, COPYRIGHT_YEAR).translated + " ") + "\n" +
"\n" + "\n" +
strprintf(_("Please contribute if you find %s useful. " strprintf(_("Please contribute if you find %s useful. "
"Visit %s for further information about the software.").translated, CLIENT_NAME, "<" CLIENT_URL ">") + "Visit %s for further information about the software."),
CLIENT_NAME, "<" CLIENT_URL ">")
.translated +
"\n" + "\n" +
strprintf(_("The source code is available from %s.").translated, URL_SOURCE_CODE) + strprintf(_("The source code is available from %s."), URL_SOURCE_CODE).translated +
"\n" + "\n" +
"\n" + "\n" +
_("This is experimental software.").translated + "\n" + _("This is experimental software.").translated + "\n" +
strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s").translated, "COPYING", "<https://opensource.org/licenses/MIT>") + strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s"), "COPYING", "<https://opensource.org/licenses/MIT>").translated +
"\n"; "\n";
} }

2
test/lint/run-lint-format-strings.py
View file

@ -13,7 +13,7 @@ import re
import sys import sys
FALSE_POSITIVES = [ FALSE_POSITIVES = [
("src/clientversion.cpp", "strprintf(_(COPYRIGHT_HOLDERS).translated, COPYRIGHT_HOLDERS_SUBSTITUTION)"), ("src/clientversion.cpp", "strprintf(_(COPYRIGHT_HOLDERS), COPYRIGHT_HOLDERS_SUBSTITUTION)"),
("src/test/translation_tests.cpp", "strprintf(format, arg)"), ("src/test/translation_tests.cpp", "strprintf(format, arg)"),
] ]