Skip to content
Open
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
2 changes: 1 addition & 1 deletion apps/web/src/PosthogAnalytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ export class PosthogAnalytics {
}

private trackNewUserEvent(): void {
// This is the only event that could have occured before analytics opt-in
// This is the only event that could have occurred before analytics opt-in
// that we want to accumulate before the user has given consent
// All other scenarios should not track a user before they have given
// explicit consent that they are ok with their analytics data being collected
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/Searching.ts
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ export interface SearchInfo {
*/
count?: number;
/**
* Describe the error if any occured.
* Describe the error if any occurred.
*/
error?: Error;
}
2 changes: 1 addition & 1 deletion apps/web/src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -1994,7 +1994,7 @@
"error_join_incompatible_version_1": "Sorry, your homeserver is too old to participate here.",
"error_join_incompatible_version_2": "Please contact your homeserver administrator.",
"error_join_title": "Failed to join",
"error_join_unknown": "An unknown error occured.",
"error_join_unknown": "An unknown error occurred.",
"error_jump_to_date": "Server returned %(statusCode)s with error code %(errorCode)s",
"error_jump_to_date_connection": "A network error occurred while trying to find and jump to the given date. Your homeserver might be down or there was just a temporary problem with your internet connection. Please try again. If this continues, please contact your homeserver administrator.",
"error_jump_to_date_details": "Error details",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export class DateSeparatorViewModel
}
} catch (err) {
logger.error(
`Error occured while trying to find event in ${roomIdForJumpRequest} ` +
`Error occurred while trying to find event in ${roomIdForJumpRequest} ` +
`at timestamp=${unixTimestamp}:`,
err,
);
Expand All @@ -186,7 +186,7 @@ export class DateSeparatorViewModel
// room.
const currentRoomId = SdkContextClass.instance.roomViewStore.getRoomId();
if (currentRoomId === roomIdForJumpRequest) {
let friendlyErrorMessage = "An error occured while trying to find and jump to the given date.";
let friendlyErrorMessage = "An error occurred while trying to find and jump to the given date.";
let submitDebugLogsContent: React.ReactElement = <></>;

if (err instanceof ConnectionError) {
Expand Down Expand Up @@ -251,7 +251,7 @@ export class DateSeparatorViewModel
public onBugReport = (err?: Error): void => {
Modal.createDialog(BugReportDialog, {
error: err,
initialText: "Error occured while using jump to date #jump-to-date",
initialText: "Error occurred while using jump to date #jump-to-date",
});
};

Expand Down
Loading