Skip to content

Commit 6a5ccd6

Browse files
committed
scripted-diff: Rename JoinErrors in more general MakeUnorderedList
-BEGIN VERIFY SCRIPT- sed -i -e 's/JoinErrors/MakeUnorderedList/' -- src/qt/bitcoin.cpp -END VERIFY SCRIPT-
1 parent 03826ae commit 6a5ccd6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/qt/bitcoin.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans
144144
QApplication::installTranslator(&translator);
145145
}
146146

147-
static std::string JoinErrors(const std::vector<std::string>& errors)
147+
static std::string MakeUnorderedList(const std::vector<std::string>& errors)
148148
{
149149
return Join(errors, "\n", [](const std::string& error) { return "- " + error; });
150150
}
@@ -158,13 +158,13 @@ static bool InitSettings()
158158
std::vector<std::string> errors;
159159
if (!gArgs.ReadSettingsFile(&errors)) {
160160
bilingual_str error = _("Settings file could not be read");
161-
InitError(Untranslated(strprintf("%s:\n%s\n", error.original, JoinErrors(errors))));
161+
InitError(Untranslated(strprintf("%s:\n%s\n", error.original, MakeUnorderedList(errors))));
162162

163163
QMessageBox messagebox(QMessageBox::Critical, PACKAGE_NAME, QString::fromStdString(strprintf("%s.", error.translated)), QMessageBox::Reset | QMessageBox::Abort);
164164
/*: Explanatory text shown on startup when the settings file cannot be read.
165165
Prompts user to make a choice between resetting or aborting. */
166166
messagebox.setInformativeText(QObject::tr("Do you want to reset settings to default values, or to abort without making changes?"));
167-
messagebox.setDetailedText(QString::fromStdString(JoinErrors(errors)));
167+
messagebox.setDetailedText(QString::fromStdString(MakeUnorderedList(errors)));
168168
messagebox.setTextFormat(Qt::PlainText);
169169
messagebox.setDefaultButton(QMessageBox::Reset);
170170
switch (messagebox.exec()) {
@@ -180,14 +180,14 @@ static bool InitSettings()
180180
errors.clear();
181181
if (!gArgs.WriteSettingsFile(&errors)) {
182182
bilingual_str error = _("Settings file could not be written");
183-
InitError(Untranslated(strprintf("%s:\n%s\n", error.original, JoinErrors(errors))));
183+
InitError(Untranslated(strprintf("%s:\n%s\n", error.original, MakeUnorderedList(errors))));
184184

185185
QMessageBox messagebox(QMessageBox::Critical, PACKAGE_NAME, QString::fromStdString(strprintf("%s.", error.translated)), QMessageBox::Ok);
186186
/*: Explanatory text shown on startup when the settings file could not be written.
187187
Prompts user to check that we have the ability to write to the file.
188188
Explains that the user has the option of running without a settings file.*/
189189
messagebox.setInformativeText(QObject::tr("A fatal error occured. Check that settings file is writable, or try running with -nosettings."));
190-
messagebox.setDetailedText(QString::fromStdString(JoinErrors(errors)));
190+
messagebox.setDetailedText(QString::fromStdString(MakeUnorderedList(errors)));
191191
messagebox.setTextFormat(Qt::PlainText);
192192
messagebox.setDefaultButton(QMessageBox::Ok);
193193
messagebox.exec();

0 commit comments

Comments
 (0)