Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Clean up messy strformat and bilingual_str usages #31072

Merged
merged 4 commits into from
Dec 6, 2024
Merged

refactor: Clean up messy strformat and bilingual_str usages #31072

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0580219
refactor: Avoid concatenation of format strings
ryanofsky Oct 11, 2024
831d2bf
refactor: Don't embed translated string in untranslated string.
ryanofsky Oct 9, 2024
006e4d1
refactor: Use + instead of strformat to concatenate translated & untr…
ryanofsky Oct 12, 2024
0184d33
scripted-diff: Replace strprintf(Untranslated) with Untranslated(strp…
ryanofsky Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: Don't embed translated string in untranslated string. 
This could produce an english error message containing non-english string
fragments if PopulateAndValidateSnapshot started returning any translated
strings in the future. This change is also needed to make the next
scripted-diff commit work.
  • Loading branch information
@ryanofsky
ryanofsky committed Dec 4, 2024
commit 831d2bfcf94117957a90f60fa5bc84a53bb61f7c
2 changes: 1 addition & 1 deletion src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5811,7 +5811,7 @@ util::Result<CBlockIndex*> ChainstateManager::ActivateSnapshot(

if (auto res{this->PopulateAndValidateSnapshot(*snapshot_chainstate, coins_file, metadata)}; !res) {
LOCK(::cs_main);
return cleanup_bad_snapshot(strprintf(Untranslated("Population failed: %s"), util::ErrorString(res)));
return cleanup_bad_snapshot(Untranslated(strprintf("Population failed: %s", util::ErrorString(res).original)));
ryanofsky marked this conversation as resolved.
Show resolved Hide resolved
}

LOCK(::cs_main); // cs_main required for rest of snapshot activation.
Expand Down