refactor: Don't embed translated string in untranslated string.

ryanofsky · ryanofsky · commit d392068d7257 · 2024-11-15T10:53:18.000-04:00
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.
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -5789,7 +5789,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)));
     }
 
     LOCK(::cs_main);  // cs_main required for rest of snapshot activation.

Original file line number	Diff line number	Diff line change
`@@ -5789,7 +5789,7 @@ util::Result<CBlockIndex*> ChainstateManager::ActivateSnapshot(`
`5789`	`5789`
`5790`	`5790`	`if (auto res{this->PopulateAndValidateSnapshot(*snapshot_chainstate, coins_file, metadata)}; !res) {`
`5791`	`5791`	`LOCK(::cs_main);`
`5792`		`- return cleanup_bad_snapshot(strprintf(Untranslated("Population failed: %s"), util::ErrorString(res)));`
	`5792`	`+ return cleanup_bad_snapshot(Untranslated(strprintf("Population failed: %s", util::ErrorString(res).original)));`
`5793`	`5793`	`}`
`5794`	`5794`
`5795`	`5795`	`LOCK(::cs_main); // cs_main required for rest of snapshot activation.`