mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-10 17:17:14 +01:00
Code Issues Projects Releases Wiki Activity

refactor: Use + instead of strformat to concatenate translated & untranslated strings

Browse source 
This change manually removes two strprintf(Untranslated...) calls. All
remaining calls are removed in the next scripted-diff commit.

Removing these calls makes code more consistent and makes it easier to
implement compile-time checking enforcing that format strings contain valid
specifiers, by avoiding the need for the Untranslated() function to be involved
in formatting.

Additionally, using + and += instead of strprintf here makes code a little
shorter, and more type-safe because + unlike strprintf only works on strings of
the same type, making it less likely english strings and bilingual strings will
be unintentionally combined.
This commit is contained in:
Ryan Ofsky 2024-10-11 20:15:32 -04:00
parent 831d2bfcf9
commit 006e4d1d59
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/node/interface_ui.cpp
View file

@ -74,7 +74,7 @@ bool InitError(const bilingual_str& str, const std::vector<std::string>& details
// functions which provide error details are ones that run during early init // functions which provide error details are ones that run during early init
// before the GUI uiInterface is registered, so there's no point passing // before the GUI uiInterface is registered, so there's no point passing
// main messages and details separately to uiInterface yet. // main messages and details separately to uiInterface yet.
return InitError(details.empty() ? str : strprintf(Untranslated("%s:\n%s"), str, MakeUnorderedList(details))); return InitError(details.empty() ? str : str + Untranslated(strprintf(":\n%s", MakeUnorderedList(details))));
} }
void InitWarning(const bilingual_str& str) void InitWarning(const bilingual_str& str)

2
src/validation.cpp
View file

@ -6142,7 +6142,7 @@ SnapshotCompletionResult ChainstateManager::MaybeCompleteSnapshotValidation()
auto rename_result = m_snapshot_chainstate->InvalidateCoinsDBOnDisk(); auto rename_result = m_snapshot_chainstate->InvalidateCoinsDBOnDisk();
if (!rename_result) { if (!rename_result) {
user_error = strprintf(Untranslated("%s\n%s"), user_error, util::ErrorString(rename_result)); user_error += Untranslated("\n") + util::ErrorString(rename_result);
} }
GetNotifications().fatalError(user_error); GetNotifications().fatalError(user_error);