Merge pull request #3042 from matrix-org/jryans/username-on-hs

Remove username on HS input label

src/components/views/auth/PasswordLogin.js

@@ -211,10 +211,7 @@ export default class PasswordLogin extends React.Component {
                     name="username" // make it a little easier for browser's remember-password
                     key="username_input"
                     type="text"
-                    label={SdkConfig.get().disable_custom_urls ?
-                        _t("Username on %(hs)s", {
-                            hs: this.props.serverConfig.hsName,
-                        }) : _t("Username")}
+                    label={_t("Username")}
                     value={this.state.username}
                     onChange={this.onUsernameChanged}
                     onBlur={this.onUsernameBlur}

src/i18n/strings/en_EN.json

@@ -1329,7 +1329,6 @@
     "The phone number field must not be blank.": "The phone number field must not be blank.",
     "The password field must not be blank.": "The password field must not be blank.",
     "Email": "Email",
-    "Username on %(hs)s": "Username on %(hs)s",
     "Username": "Username",
     "Phone": "Phone",
     "Not sure of your password? <a>Set a new one</a>": "Not sure of your password? <a>Set a new one</a>",