From caf545f1a46df04525ee7ae19d6d39932eaf9c62 Mon Sep 17 00:00:00 2001 From: Christian Paul Date: Tue, 22 Nov 2022 15:17:43 +0100 Subject: [PATCH] Misspelling: occured -> occurred (#576) * Typo: occured -> occurred * Add newsfile 576 --- changelog.d/576.misc | 1 + src/AdminRoom.ts | 2 +- src/Notifications/GitHubWatcher.ts | 2 +- src/Widgets/BridgeWidgetApi.ts | 2 +- src/api/error.ts | 2 +- web/components/elements/ErrorPane.tsx | 2 +- web/components/elements/WarningPane.tsx | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 changelog.d/576.misc diff --git a/changelog.d/576.misc b/changelog.d/576.misc new file mode 100644 index 000000000..b0d80b501 --- /dev/null +++ b/changelog.d/576.misc @@ -0,0 +1 @@ +Fix misspellings of "occurred" in error messages. diff --git a/src/AdminRoom.ts b/src/AdminRoom.ts index 8b1141e1b..2b33e0034 100644 --- a/src/AdminRoom.ts +++ b/src/AdminRoom.ts @@ -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; } diff --git a/src/Notifications/GitHubWatcher.ts b/src/Notifications/GitHubWatcher.ts index bc3a595d6..6d573a6f6 100644 --- a/src/Notifications/GitHubWatcher.ts +++ b/src/Notifications/GitHubWatcher.ts @@ -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++; diff --git a/src/Widgets/BridgeWidgetApi.ts b/src/Widgets/BridgeWidgetApi.ts index 795cfdd24..5f7ef991e 100644 --- a/src/Widgets/BridgeWidgetApi.ts +++ b/src/Widgets/BridgeWidgetApi.ts @@ -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); } } diff --git a/src/api/error.ts b/src/api/error.ts index 004f6d281..f9bef2a63 100644 --- a/src/api/error.ts +++ b/src/api/error.ts @@ -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); } } } \ No newline at end of file diff --git a/web/components/elements/ErrorPane.tsx b/web/components/elements/ErrorPane.tsx index 54628acc4..466e4a5f9 100644 --- a/web/components/elements/ErrorPane.tsx +++ b/web/components/elements/ErrorPane.tsx @@ -4,6 +4,6 @@ import style from "./ErrorPane.module.scss"; export const ErrorPane: FunctionComponent<{header?: string}> = ({ children, header }) => { return
-

{ header || "Error occured during widget load" }: {children}

+

{ header || "Error occurred during widget load" }: {children}

; }; \ No newline at end of file diff --git a/web/components/elements/WarningPane.tsx b/web/components/elements/WarningPane.tsx index 021edd511..c37a99847 100644 --- a/web/components/elements/WarningPane.tsx +++ b/web/components/elements/WarningPane.tsx @@ -4,6 +4,6 @@ import style from "./WarningPane.module.scss"; export const WarningPane: FunctionComponent<{header?: string}> = ({ children, header }) => { return
-

{ header || "Problem occured during widget load" }: {children}

+

{ header || "Problem occurred during widget load" }: {children}

; }; \ No newline at end of file