mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
refactor: Use + instead of strformat to concatenate translated & untranslated strings
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:
parent
831d2bfcf9
commit
006e4d1d59
2 changed files with 2 additions and 2 deletions
|
|
@ -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
|
||||
// before the GUI uiInterface is registered, so there's no point passing
|
||||
// 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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue