Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misspelling: occured -> occurred #576

Merged
merged 2 commits into from
Nov 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/576.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix misspellings of "occurred" in error messages.
2 changes: 1 addition & 1 deletion src/AdminRoom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ export class AdminRoom extends AdminRoomCommandHandler {
return this.sendNotice(`Failed to handle command: ${result.humanError}`);
} else if ("error" in result) {
// Error is not something we want to print to the user.
return this.sendNotice(`Failed to handle command: A unknown failure occured. Contact your bridge admin`);
return this.sendNotice(`Failed to handle command: A unknown failure occurred. Contact your bridge admin`);
}
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Notifications/GitHubWatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export class GitHubWatcher extends EventEmitter implements NotificationWatcherTa
}

private handleGitHubFailure(ex: RequestError) {
log.error("An error occured getting notifications:", ex);
log.error("An error occurred getting notifications:", ex);
if (ex.status === 401 || ex.status === 404) {
log.warn(`Got status ${ex.status} when handing user stream: ${ex.message}`);
this.failureCount++;
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/BridgeWidgetApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export class BridgeWidgetApi {
res.send(await room.getBridgeState());
} catch (ex) {
log.error(`Failed to get room state:`, ex);
throw new ApiError("An error occured when getting room state", ErrCode.Unknown);
throw new ApiError("An error occurred when getting room state", ErrCode.Unknown);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/api/error.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export function errorMiddleware(log: Logger) {
if (err instanceof ApiError) {
err.apply(res);
} else {
new ApiError("An internal error occured").apply(res);
new ApiError("An internal error occurred").apply(res);
}
}
}
2 changes: 1 addition & 1 deletion web/components/elements/ErrorPane.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ import style from "./ErrorPane.module.scss";

export const ErrorPane: FunctionComponent<{header?: string}> = ({ children, header }) => {
return <div class={`card error ${style.errorPane}`}>
<p><strong><img src={ErrorBadge} /> { header || "Error occured during widget load" }</strong>: {children}</p>
<p><strong><img src={ErrorBadge} /> { header || "Error occurred during widget load" }</strong>: {children}</p>
</div>;
};
2 changes: 1 addition & 1 deletion web/components/elements/WarningPane.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ import style from "./WarningPane.module.scss";

export const WarningPane: FunctionComponent<{header?: string}> = ({ children, header }) => {
return <div class={`card error ${style.warningPane}`}>
<p><strong><img src={WarningBadge} /> { header || "Problem occured during widget load" }</strong>: {children}</p>
<p><strong><img src={WarningBadge} /> { header || "Problem occurred during widget load" }</strong>: {children}</p>
</div>;
};