Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Update open in other tab message #11916

Merged
merged 1 commit into from
Nov 22, 2023
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
2 changes: 1 addition & 1 deletion src/components/structures/auth/SessionLockStolenView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function SessionLockStolenView(): JSX.Element {

return (
<SplashPage className="mx_SessionLockStolenView">
<h1>{_t("common|error")}</h1>
<h1>{_t("error_app_open_in_another_tab_title", { brand })}</h1>
<h2>{_t("error_app_open_in_another_tab", { brand })}</h2>
</SplashPage>
);
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,8 @@
"unknown_error_code": "unknown error code",
"update_power_level": "Failed to change power level"
},
"error_app_open_in_another_tab": "%(brand)s has been opened in another tab.",
"error_app_open_in_another_tab": "Switch to the other tab to connect to %(brand)s. This tab can now be closed.",
"error_app_open_in_another_tab_title": "%(brand)s is connected in another tab",
"error_app_opened_in_another_window": "%(brand)s is open in another window. Click \"%(label)s\" to use %(brand)s here and disconnect the other window.",
"error_database_closed_description": "This may be caused by having the app open in multiple tabs or due to clearing browser data.",
"error_database_closed_title": "Database unexpectedly closed",
Expand Down
2 changes: 1 addition & 1 deletion test/components/structures/MatrixChat-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ describe("<MatrixChat />", () => {
await flushPromises();

// now we should see the error page
rendered.getByText("Test has been opened in another tab.");
rendered.getByText("Test is connected in another tab");

// let initCrypto complete, and check we don't get a modal
initCryptoCompleteDefer.resolve();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ exports[`<MatrixChat /> Multi-tab lockout shows the lockout page when a second t
class="mx_SessionLockStolenView mx_SplashPage"
>
<h1>
Error
Test is connected in another tab
</h1>
<h2>
Test has been opened in another tab.
Switch to the other tab to connect to Test. This tab can now be closed.
</h2>
</main>
</div>
Expand All @@ -22,10 +22,10 @@ exports[`<MatrixChat /> Multi-tab lockout shows the lockout page when a second t
class="mx_SessionLockStolenView mx_SplashPage"
>
<h1>
Error
Test is connected in another tab
</h1>
<h2>
Test has been opened in another tab.
Switch to the other tab to connect to Test. This tab can now be closed.
</h2>
</main>
</div>
Expand All @@ -38,10 +38,10 @@ exports[`<MatrixChat /> Multi-tab lockout shows the lockout page when a second t
class="mx_SessionLockStolenView mx_SplashPage"
>
<h1>
Error
Test is connected in another tab
</h1>
<h2>
Test has been opened in another tab.
Switch to the other tab to connect to Test. This tab can now be closed.
</h2>
</main>
</div>
Expand All @@ -53,10 +53,10 @@ exports[`<MatrixChat /> Multi-tab lockout shows the lockout page when a second t
class="mx_SessionLockStolenView mx_SplashPage"
>
<h1>
Error
Test is connected in another tab
</h1>
<h2>
Test has been opened in another tab.
Switch to the other tab to connect to Test. This tab can now be closed.
</h2>
</main>
</div>
Expand Down
Loading