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

ryanofsky · ryanofsky · commit 831d2bfcf941 · 2024-12-04T15:09:05.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
@@ -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)));
     }
 
     LOCK(::cs_main);  // cs_main required for rest of snapshot activation.

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