Merge pull request #2552 from jryans/spell-homeserver
Spell homeserver correctly
This commit is contained in:
commit
e6b6133c7a
12 changed files with 27 additions and 27 deletions
|
@ -4081,7 +4081,7 @@ Changes in [0.6.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v
|
||||||
[\#297](https://github.com/matrix-org/matrix-react-sdk/pull/297)
|
[\#297](https://github.com/matrix-org/matrix-react-sdk/pull/297)
|
||||||
* multiple URL preview support
|
* multiple URL preview support
|
||||||
[\#290](https://github.com/matrix-org/matrix-react-sdk/pull/290)
|
[\#290](https://github.com/matrix-org/matrix-react-sdk/pull/290)
|
||||||
* Add a fallback home server to log into
|
* Add a fallback homeserver to log into
|
||||||
[\#293](https://github.com/matrix-org/matrix-react-sdk/pull/293)
|
[\#293](https://github.com/matrix-org/matrix-react-sdk/pull/293)
|
||||||
* Hopefully fix memory leak with velocity
|
* Hopefully fix memory leak with velocity
|
||||||
[\#291](https://github.com/matrix-org/matrix-react-sdk/pull/291)
|
[\#291](https://github.com/matrix-org/matrix-react-sdk/pull/291)
|
||||||
|
|
|
@ -19,7 +19,7 @@ import MatrixClientPeg from './MatrixClientPeg';
|
||||||
import { _t } from './languageHandler';
|
import { _t } from './languageHandler';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allows a user to add a third party identifier to their Home Server and,
|
* Allows a user to add a third party identifier to their homeserver and,
|
||||||
* optionally, the identity servers.
|
* optionally, the identity servers.
|
||||||
*
|
*
|
||||||
* This involves getting an email token from the identity server to "prove" that
|
* This involves getting an email token from the identity server to "prove" that
|
||||||
|
|
|
@ -359,7 +359,7 @@ class ContentMessages {
|
||||||
if (!upload.canceled) {
|
if (!upload.canceled) {
|
||||||
let desc = _t('The file \'%(fileName)s\' failed to upload', {fileName: upload.fileName}) + '.';
|
let desc = _t('The file \'%(fileName)s\' failed to upload', {fileName: upload.fileName}) + '.';
|
||||||
if (err.http_status == 413) {
|
if (err.http_status == 413) {
|
||||||
desc = _t('The file \'%(fileName)s\' exceeds this home server\'s size limit for uploads', {fileName: upload.fileName});
|
desc = _t('The file \'%(fileName)s\' exceeds this homeserver\'s size limit for uploads', {fileName: upload.fileName});
|
||||||
}
|
}
|
||||||
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
|
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
|
||||||
Modal.createTrackedDialog('Upload failed', '', ErrorDialog, {
|
Modal.createTrackedDialog('Upload failed', '', ErrorDialog, {
|
||||||
|
|
|
@ -85,7 +85,7 @@ class MatrixClientPeg {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Replace this MatrixClientPeg's client with a client instance that has
|
* Replace this MatrixClientPeg's client with a client instance that has
|
||||||
* Home Server / Identity Server URLs and active credentials
|
* homeserver / identity server URLs and active credentials
|
||||||
*/
|
*/
|
||||||
replaceUsingCreds(creds: MatrixClientCreds) {
|
replaceUsingCreds(creds: MatrixClientCreds) {
|
||||||
this._currentClientCreds = creds;
|
this._currentClientCreds = creds;
|
||||||
|
@ -164,14 +164,14 @@ class MatrixClientPeg {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the server name of the user's home server
|
* Return the server name of the user's homeserver
|
||||||
* Throws an error if unable to deduce the home server name
|
* Throws an error if unable to deduce the homeserver name
|
||||||
* (eg. if the user is not logged in)
|
* (eg. if the user is not logged in)
|
||||||
*/
|
*/
|
||||||
getHomeServerName() {
|
getHomeServerName() {
|
||||||
const matches = /^@.+:(.+)$/.exec(this.matrixClient.credentials.userId);
|
const matches = /^@.+:(.+)$/.exec(this.matrixClient.credentials.userId);
|
||||||
if (matches === null || matches.length < 1) {
|
if (matches === null || matches.length < 1) {
|
||||||
throw new Error("Failed to derive home server name from user ID!");
|
throw new Error("Failed to derive homeserver name from user ID!");
|
||||||
}
|
}
|
||||||
return matches[1];
|
return matches[1];
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,7 @@ class Presence {
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Start listening the user activity to evaluate his presence state.
|
* Start listening the user activity to evaluate his presence state.
|
||||||
* Any state change will be sent to the Home Server.
|
* Any state change will be sent to the homeserver.
|
||||||
*/
|
*/
|
||||||
async start() {
|
async start() {
|
||||||
this._unavailableTimer = new Timer(UNAVAILABLE_TIME_MS);
|
this._unavailableTimer = new Timer(UNAVAILABLE_TIME_MS);
|
||||||
|
@ -78,7 +78,7 @@ class Presence {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the presence state.
|
* Set the presence state.
|
||||||
* If the state has changed, the Home Server will be notified.
|
* If the state has changed, the homeserver will be notified.
|
||||||
* @param {string} newState the new presence state (see PRESENCE enum)
|
* @param {string} newState the new presence state (see PRESENCE enum)
|
||||||
*/
|
*/
|
||||||
async setState(newState) {
|
async setState(newState) {
|
||||||
|
|
|
@ -1324,7 +1324,7 @@ export default React.createClass({
|
||||||
} else {
|
} else {
|
||||||
let extraText;
|
let extraText;
|
||||||
if (this.state.error.errcode === 'M_UNRECOGNIZED') {
|
if (this.state.error.errcode === 'M_UNRECOGNIZED') {
|
||||||
extraText = <div>{ _t('This Home server does not support communities') }</div>;
|
extraText = <div>{ _t('This homeserver does not support communities') }</div>;
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<div className="mx_GroupView_error">
|
<div className="mx_GroupView_error">
|
||||||
|
|
|
@ -96,9 +96,9 @@ module.exports = React.createClass({
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
|
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
|
||||||
Modal.createTrackedDialog('Failed to get protocol list from Home Server', '', ErrorDialog, {
|
Modal.createTrackedDialog('Failed to get protocol list from homeserver', '', ErrorDialog, {
|
||||||
title: _t('Failed to get protocol list from Home Server'),
|
title: _t('Failed to get protocol list from homeserver'),
|
||||||
description: _t('The Home Server may be too old to support third party networks'),
|
description: _t('The homeserver may be too old to support third party networks'),
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@ module.exports = React.createClass({
|
||||||
// * invitedEmail (string) The email address that was invited to this room
|
// * invitedEmail (string) The email address that was invited to this room
|
||||||
thirdPartyInvite: PropTypes.object,
|
thirdPartyInvite: PropTypes.object,
|
||||||
|
|
||||||
// Any data about the room that would normally come from the Home Server
|
// Any data about the room that would normally come from the homeserver
|
||||||
// but has been passed out-of-band, eg. the room name and avatar URL
|
// but has been passed out-of-band, eg. the room name and avatar URL
|
||||||
// from an email invite (a workaround for the fact that we can't
|
// from an email invite (a workaround for the fact that we can't
|
||||||
// get this information from the HS using an email invite).
|
// get this information from the HS using an email invite).
|
||||||
|
|
|
@ -63,7 +63,7 @@ module.exports = React.createClass({
|
||||||
defaultIsUrl: PropTypes.string,
|
defaultIsUrl: PropTypes.string,
|
||||||
// Secondary HS which we try to log into if the user is using
|
// Secondary HS which we try to log into if the user is using
|
||||||
// the default HS but login fails. Useful for migrating to a
|
// the default HS but login fails. Useful for migrating to a
|
||||||
// different home server without confusing users.
|
// different homeserver without confusing users.
|
||||||
fallbackHsUrl: PropTypes.string,
|
fallbackHsUrl: PropTypes.string,
|
||||||
|
|
||||||
// An error passed along from higher up explaining that something
|
// An error passed along from higher up explaining that something
|
||||||
|
@ -160,7 +160,7 @@ module.exports = React.createClass({
|
||||||
// Some error strings only apply for logging in
|
// Some error strings only apply for logging in
|
||||||
const usingEmail = username.indexOf("@") > 0;
|
const usingEmail = username.indexOf("@") > 0;
|
||||||
if (error.httpStatus === 400 && usingEmail) {
|
if (error.httpStatus === 400 && usingEmail) {
|
||||||
errorText = _t('This Home Server does not support login using email address.');
|
errorText = _t('This homeserver does not support login using email address.');
|
||||||
} else if (error.errcode == 'M_RESOURCE_LIMIT_EXCEEDED') {
|
} else if (error.errcode == 'M_RESOURCE_LIMIT_EXCEEDED') {
|
||||||
const errorTop = messageForResourceLimitError(
|
const errorTop = messageForResourceLimitError(
|
||||||
error.data.limit_type,
|
error.data.limit_type,
|
||||||
|
@ -241,7 +241,7 @@ module.exports = React.createClass({
|
||||||
}, function(error) {
|
}, function(error) {
|
||||||
let errorText;
|
let errorText;
|
||||||
if (error.httpStatus === 403) {
|
if (error.httpStatus === 403) {
|
||||||
errorText = _t("Guest access is disabled on this Home Server.");
|
errorText = _t("Guest access is disabled on this homeserver.");
|
||||||
} else {
|
} else {
|
||||||
errorText = self._errorTextFromError(error);
|
errorText = self._errorTextFromError(error);
|
||||||
}
|
}
|
||||||
|
|
|
@ -141,7 +141,7 @@ module.exports = React.createClass({
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div ref="recaptchaContainer">
|
<div ref="recaptchaContainer">
|
||||||
{ _t("This Home Server would like to make sure you are not a robot") }
|
{ _t("This homeserver would like to make sure you are not a robot.") }
|
||||||
<br />
|
<br />
|
||||||
<div id={DIV_ID}></div>
|
<div id={DIV_ID}></div>
|
||||||
{ error }
|
{ error }
|
||||||
|
|
|
@ -61,7 +61,7 @@ export default class DevicesPanel extends React.Component {
|
||||||
let errtxt;
|
let errtxt;
|
||||||
if (error.httpStatus == 404) {
|
if (error.httpStatus == 404) {
|
||||||
// 404 probably means the HS doesn't yet support the API.
|
// 404 probably means the HS doesn't yet support the API.
|
||||||
errtxt = _t("Your home server does not support device management.");
|
errtxt = _t("Your homeserver does not support device management.");
|
||||||
} else {
|
} else {
|
||||||
console.error("Error loading devices:", error);
|
console.error("Error loading devices:", error);
|
||||||
errtxt = _t("Unable to load device list");
|
errtxt = _t("Unable to load device list");
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
"Permission Required": "Permission Required",
|
"Permission Required": "Permission Required",
|
||||||
"You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
|
"You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
|
||||||
"The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
|
"The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
|
||||||
"The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
|
"The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "The file '%(fileName)s' exceeds this homeserver's size limit for uploads",
|
||||||
"Upload Failed": "Upload Failed",
|
"Upload Failed": "Upload Failed",
|
||||||
"Failure to create room": "Failure to create room",
|
"Failure to create room": "Failure to create room",
|
||||||
"Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
|
"Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
|
||||||
|
@ -352,7 +352,7 @@
|
||||||
"New Password": "New Password",
|
"New Password": "New Password",
|
||||||
"Confirm password": "Confirm password",
|
"Confirm password": "Confirm password",
|
||||||
"Change Password": "Change Password",
|
"Change Password": "Change Password",
|
||||||
"Your home server does not support device management.": "Your home server does not support device management.",
|
"Your homeserver does not support device management.": "Your homeserver does not support device management.",
|
||||||
"Unable to load device list": "Unable to load device list",
|
"Unable to load device list": "Unable to load device list",
|
||||||
"Authentication": "Authentication",
|
"Authentication": "Authentication",
|
||||||
"Delete %(count)s devices|other": "Delete %(count)s devices",
|
"Delete %(count)s devices|other": "Delete %(count)s devices",
|
||||||
|
@ -1179,7 +1179,7 @@
|
||||||
"Login": "Login",
|
"Login": "Login",
|
||||||
"powered by Matrix": "powered by Matrix",
|
"powered by Matrix": "powered by Matrix",
|
||||||
"Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
|
"Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
|
||||||
"This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot",
|
"This homeserver would like to make sure you are not a robot.": "This homeserver would like to make sure you are not a robot.",
|
||||||
"Custom Server Options": "Custom Server Options",
|
"Custom Server Options": "Custom Server Options",
|
||||||
"You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app 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 this app 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 this app 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 this app with an existing Matrix account on a different homeserver.",
|
||||||
"You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.",
|
"You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.",
|
||||||
|
@ -1274,7 +1274,7 @@
|
||||||
"Long Description (HTML)": "Long Description (HTML)",
|
"Long Description (HTML)": "Long Description (HTML)",
|
||||||
"Description": "Description",
|
"Description": "Description",
|
||||||
"Community %(groupId)s not found": "Community %(groupId)s not found",
|
"Community %(groupId)s not found": "Community %(groupId)s not found",
|
||||||
"This Home server does not support communities": "This Home server does not support communities",
|
"This homeserver does not support communities": "This homeserver does not support communities",
|
||||||
"Failed to load %(groupId)s": "Failed to load %(groupId)s",
|
"Failed to load %(groupId)s": "Failed to load %(groupId)s",
|
||||||
"Couldn't load home page": "Couldn't load home page",
|
"Couldn't load home page": "Couldn't load home page",
|
||||||
"You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
|
"You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
|
||||||
|
@ -1302,8 +1302,8 @@
|
||||||
"Create a new community": "Create a new community",
|
"Create a new community": "Create a new community",
|
||||||
"Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
|
"Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
|
||||||
"You have no visible notifications": "You have no visible notifications",
|
"You have no visible notifications": "You have no visible notifications",
|
||||||
"Failed to get protocol list from Home Server": "Failed to get protocol list from Home Server",
|
"Failed to get protocol list from homeserver": "Failed to get protocol list from homeserver",
|
||||||
"The Home Server may be too old to support third party networks": "The Home Server may be too old to support third party networks",
|
"The homeserver may be too old to support third party networks": "The homeserver may be too old to support third party networks",
|
||||||
"Failed to get public room list": "Failed to get public room list",
|
"Failed to get public room list": "Failed to get public room list",
|
||||||
"The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
|
"The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
|
||||||
"Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
|
"Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
|
||||||
|
@ -1400,11 +1400,11 @@
|
||||||
"Invalid homeserver discovery response": "Invalid homeserver discovery response",
|
"Invalid homeserver discovery response": "Invalid homeserver discovery response",
|
||||||
"Invalid identity server discovery response": "Invalid identity server discovery response",
|
"Invalid identity server discovery response": "Invalid identity server discovery response",
|
||||||
"General failure": "General failure",
|
"General failure": "General failure",
|
||||||
"This Home Server does not support login using email address.": "This Home Server does not support login using email address.",
|
"This homeserver does not support login using email address.": "This homeserver does not support login using email address.",
|
||||||
"Please <a>contact your service administrator</a> to continue using this service.": "Please <a>contact your service administrator</a> to continue using this service.",
|
"Please <a>contact your service administrator</a> to continue using this service.": "Please <a>contact your service administrator</a> to continue using this service.",
|
||||||
"Incorrect username and/or password.": "Incorrect username and/or password.",
|
"Incorrect username and/or password.": "Incorrect username and/or password.",
|
||||||
"Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.",
|
"Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.",
|
||||||
"Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
|
"Guest access is disabled on this homeserver.": "Guest access is disabled on this homeserver.",
|
||||||
"Failed to perform homeserver discovery": "Failed to perform homeserver discovery",
|
"Failed to perform homeserver discovery": "Failed to perform homeserver discovery",
|
||||||
"The phone number entered looks invalid": "The phone number entered looks invalid",
|
"The phone number entered looks invalid": "The phone number entered looks invalid",
|
||||||
"Unknown failure discovering homeserver": "Unknown failure discovering homeserver",
|
"Unknown failure discovering homeserver": "Unknown failure discovering homeserver",
|
||||||
|
|
Loading…
Reference in a new issue