diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp index 54daf9912..f3f9c8a71 100644 --- a/src/controllers/commands/CommandController.cpp +++ b/src/controllers/commands/CommandController.cpp @@ -337,7 +337,7 @@ void CommandController::initialize(Settings &, Paths &paths) [channel, target]() { channel->addMessage(makeSystemMessage( QString("User %1 could not be followed, an unknown " - "error occured!") + "error occurred!") .arg(target))); }); }, diff --git a/src/providers/twitch/TwitchAccount.cpp b/src/providers/twitch/TwitchAccount.cpp index 90b4c6ae4..166b0e34f 100644 --- a/src/providers/twitch/TwitchAccount.cpp +++ b/src/providers/twitch/TwitchAccount.cpp @@ -175,9 +175,10 @@ void TwitchAccount::ignoreByID( .authorizeTwitchV5(this->getOAuthClient(), this->getOAuthToken()) .onError([=](NetworkResult result) { onFinished(IgnoreResult_Failed, - "An unknown error occured while trying to ignore user " + - targetName + " (" + - QString::number(result.status()) + ")"); + QString("An unknown error occurred while trying to " + "ignore user %1 (%2)") + .arg(targetName) + .arg(result.status())); }) .onSuccess([=](auto result) -> Outcome { auto document = result.parseRapidJson(); @@ -253,7 +254,7 @@ void TwitchAccount::unignoreByID( .onError([=](NetworkResult result) { onFinished( UnignoreResult_Failed, - "An unknown error occured while trying to unignore user " + + "An unknown error occurred while trying to unignore user " + targetName + " (" + QString::number(result.status()) + ")"); }) .onSuccess([=](auto result) -> Outcome { diff --git a/src/util/StreamLink.cpp b/src/util/StreamLink.cpp index 7f3d873d4..b47297aa9 100644 --- a/src/util/StreamLink.cpp +++ b/src/util/StreamLink.cpp @@ -93,7 +93,7 @@ namespace { } else { - qCWarning(chatterinoStreamlink) << "Error occured" << err; + qCWarning(chatterinoStreamlink) << "Error occurred" << err; } p->deleteLater(); diff --git a/src/widgets/dialogs/LoginDialog.cpp b/src/widgets/dialogs/LoginDialog.cpp index 011d4d47e..cab2c966d 100644 --- a/src/widgets/dialogs/LoginDialog.cpp +++ b/src/widgets/dialogs/LoginDialog.cpp @@ -97,7 +97,7 @@ BasicLoginWidget::BasicLoginWidget() this->ui_.unableToOpenBrowserHelper.setWordWrap(true); this->ui_.unableToOpenBrowserHelper.hide(); this->ui_.unableToOpenBrowserHelper.setText( - "An error occured while attempting to open the log in link (" + logInLink + ") " + " - open it manually in your browser and proceed from there."); this->ui_.unableToOpenBrowserHelper.setOpenExternalLinks(true); diff --git a/src/widgets/settingspages/FiltersPage.cpp b/src/widgets/settingspages/FiltersPage.cpp index 0989265c9..18ac1de2b 100644 --- a/src/widgets/settingspages/FiltersPage.cpp +++ b/src/widgets/settingspages/FiltersPage.cpp @@ -103,7 +103,7 @@ void FiltersPage::tableCellClicked(const QModelIndex &clicked, { popup.setIcon(QMessageBox::Icon::Warning); popup.setWindowTitle("Invalid filter"); - popup.setText(QString("Parsing errors occured:")); + popup.setText(QString("Parsing errors occurred:")); popup.setInformativeText(f.errors().join("\n")); }