Tweak login wording to match design

This commit is contained in:
J. Ryan Stinnett 2019-02-05 15:36:00 +00:00
parent dbe14c5527
commit 02a20fa668
3 changed files with 9 additions and 11 deletions

View file

@ -636,7 +636,7 @@ module.exports = React.createClass({
<AuthHeader /> <AuthHeader />
<AuthBody> <AuthBody>
<h2> <h2>
{_t('Sign in to your account')} {_t('Sign in')}
{loader} {loader}
</h2> </h2>
{ errorTextSection } { errorTextSection }

View file

@ -249,10 +249,10 @@ class PasswordLogin extends React.Component {
</span>; </span>;
} }
let yourMatrixAccountText = _t('Your account'); let signInToText = _t('Sign in');
try { try {
const parsedHsUrl = new URL(this.props.hsUrl); const parsedHsUrl = new URL(this.props.hsUrl);
yourMatrixAccountText = _t('Your %(serverName)s account', { signInToText = _t('Sign in to %(serverName)s', {
serverName: parsedHsUrl.hostname, serverName: parsedHsUrl.hostname,
}); });
} catch (e) { } catch (e) {
@ -264,7 +264,7 @@ class PasswordLogin extends React.Component {
editLink = <a className="mx_AuthBody_editServerDetails" editLink = <a className="mx_AuthBody_editServerDetails"
href="#" onClick={this.props.onEditServerDetailsClick} href="#" onClick={this.props.onEditServerDetailsClick}
> >
{_t('Edit')} {_t('Change')}
</a>; </a>;
} }
@ -297,7 +297,7 @@ class PasswordLogin extends React.Component {
return ( return (
<div> <div>
<h3> <h3>
{yourMatrixAccountText} {signInToText}
{editLink} {editLink}
</h3> </h3>
<form onSubmit={this.onSubmitForm}> <form onSubmit={this.onSubmitForm}>

View file

@ -870,12 +870,12 @@
"Delete widget": "Delete widget", "Delete widget": "Delete widget",
"Failed to remove widget": "Failed to remove widget", "Failed to remove widget": "Failed to remove widget",
"An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room", "An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room",
"Revoke widget access": "Revoke widget access",
"Minimize apps": "Minimize apps", "Minimize apps": "Minimize apps",
"Reload widget": "Reload widget", "Reload widget": "Reload widget",
"Popout widget": "Popout widget", "Popout widget": "Popout widget",
"Picture": "Picture", "Picture": "Picture",
"Edit": "Edit", "Edit": "Edit",
"Revoke widget access": "Revoke widget access",
"Create new room": "Create new room", "Create new room": "Create new room",
"Unblacklist": "Unblacklist", "Unblacklist": "Unblacklist",
"Blacklist": "Blacklist", "Blacklist": "Blacklist",
@ -1064,7 +1064,6 @@
"To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.", "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.",
"Report bugs & give feedback": "Report bugs & give feedback", "Report bugs & give feedback": "Report bugs & give feedback",
"Go back": "Go back", "Go back": "Go back",
"Visit old settings": "Visit old settings",
"Room Settings": "Room Settings", "Room Settings": "Room Settings",
"Failed to upgrade room": "Failed to upgrade room", "Failed to upgrade room": "Failed to upgrade room",
"The room upgrade could not be completed": "The room upgrade could not be completed", "The room upgrade could not be completed": "The room upgrade could not be completed",
@ -1196,10 +1195,10 @@
"Username": "Username", "Username": "Username",
"Mobile phone number": "Mobile phone number", "Mobile phone number": "Mobile phone number",
"Not sure of your password? <a>Set a new one</a>": "Not sure of your password? <a>Set a new one</a>", "Not sure of your password? <a>Set a new one</a>": "Not sure of your password? <a>Set a new one</a>",
"Your account": "Your account",
"Your %(serverName)s account": "Your %(serverName)s account",
"Sign in with": "Sign in with",
"Sign in": "Sign in", "Sign in": "Sign in",
"Sign in to %(serverName)s": "Sign in to %(serverName)s",
"Change": "Change",
"Sign in with": "Sign in with",
"If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?", "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
"Create your account": "Create your account", "Create your account": "Create your account",
"Create your %(serverName)s account": "Create your %(serverName)s account", "Create your %(serverName)s account": "Create your %(serverName)s account",
@ -1403,7 +1402,6 @@
"Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.", "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
"Sign in with single sign-on": "Sign in with single sign-on", "Sign in with single sign-on": "Sign in with single sign-on",
"Try the app first": "Try the app first", "Try the app first": "Try the app first",
"Sign in to your account": "Sign in to your account",
"Create account": "Create account", "Create account": "Create account",
"Failed to fetch avatar URL": "Failed to fetch avatar URL", "Failed to fetch avatar URL": "Failed to fetch avatar URL",
"Set a display name:": "Set a display name:", "Set a display name:": "Set a display name:",