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

Fix help prompts in custom Server Config #5320

Closed
t3chguy wants to merge 2 commits into from
Closed

Fix help prompts in custom Server Config #5320

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80bdc5b
Fix help prompts in custom Server Config
t3chguy Oct 14, 2020
67ca8b3
iterate
t3chguy Oct 15, 2020
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
6 changes: 3 additions & 3 deletions src/components/views/auth/ServerConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,12 @@ export default class ServerConfig extends React.PureComponent {
});
};

showIsHelpPopup = () => {
showIdentityServerHelpPopup = () => {
Modal.createTrackedDialog('What does this mean?', 'IS', InfoDialog, {
title: _t("Identity Server URL"),
description: _t(
"The optional identity server is responsible for allowing you " +
"to find people by their e-mail address.",
"to find people by their e-mail address and phone number.",
Copy link
Copy Markdown
Member

@turt2live turt2live Oct 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still no mention of pending 3pid invites for your own account :(

{ brand: SdkConfig.get().brand },
),
button: _t("Dismiss"),
Expand Down Expand Up @@ -266,7 +266,7 @@ export default class ServerConfig extends React.PureComponent {
});
return <div className={classes}>
{_t("Enter your custom identity server URL <a>What does this mean?</a>", {}, {
a: sub => <a className="mx_ServerConfig_help" href="#" onClick={this.showIsHelpPopup}>
a: sub => <a className="mx_ServerConfig_help" href="#" onClick={this.showIdentityServerHelpPopup}>
{sub}
</a>,
})}
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1974,7 +1974,7 @@
"Homeserver URL": "Homeserver URL",
"You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.",
"Identity Server URL": "Identity Server URL",
"The optional identity server is responsible for allowing you to find people by their e-mail address.": "The optional identity server is responsible for allowing you to find people by their e-mail address.",
"The optional identity server is responsible for allowing you to find people by their e-mail address and phone number.": "The optional identity server is responsible for allowing you to find people by their e-mail address and phone number.",
"Enter your custom homeserver URL <a>What does this mean?</a>": "Enter your custom homeserver URL <a>What does this mean?</a>",
"Enter your custom identity server URL <a>What does this mean?</a>": "Enter your custom identity server URL <a>What does this mean?</a>",
"Other servers": "Other servers",
Expand Down