Merge #13775: doc: Remove newlines from error message

620361fce8 Fix accidental use of the addition assignment operator ("+="). Remove newlines from error message. (practicalswift)

Pull request description:

  Fix accidental use of the addition assignment operator (`+=`).

  _Note to reviewers:_ Perhaps the `\n`:s should be removed too?

Tree-SHA512: 4e8c2dfd6025d78ef9d60522297994829dacc447e6b6782e15c0bdd5dd2daa17ca9a8948bfa9a15be57d9286092356381d7e6747980303852d273eb0df0dd76b
This commit is contained in:
MarcoFalke 2018-07-27 14:38:45 -04:00 committed by pasta
parent ba32ad8620
commit af08c75579
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
2 changed files with 2 additions and 2 deletions

View File

@ -1113,7 +1113,7 @@ bool AppInitParameterInteraction()
// also see: InitParameterInteraction()
if (!fs::is_directory(GetBlocksDir(false))) {
return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist.\n"), gArgs.GetArg("-blocksdir", "").c_str()));
return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist."), gArgs.GetArg("-blocksdir", "").c_str()));
}
// if using block pruning, then disallow txindex and require disabling governance validation

View File

@ -5188,7 +5188,7 @@ CWallet* CWallet::CreateWalletFromFile(const std::string& name, const fs::path&
// Top up the keypool
if (!walletInstance->TopUpKeyPool()) {
return error(_("Unable to generate initial keys") += "\n");
return error(_("Unable to generate initial keys"));
}
walletInstance->SetBestChain(chainActive.GetLocator());