PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #599 from DanielDent/unbranded-error-messages

Browse source 
Unbranded error messages
This commit is contained in:
Matthew Hodgson 2016-12-21 22:46:38 +00:00 committed by GitHub
commit 645349f542
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CallHandler.js
View file

@ -280,7 +280,7 @@ function _onAction(payload) {
var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
Modal.createDialog(QuestionDialog, {
title: "Warning!",
description: "Conference calling in Riot is in development and may not be reliable.",
description: "Conference calling is in development and may not be reliable.",
onFinished: confirm=>{
if (confirm) {
ConferenceHandler.createNewMatrixCall(

2
src/components/structures/TimelinePanel.js
View file

@ -810,7 +810,7 @@ var TimelinePanel = React.createClass({
});
};
}
var message = "Riot was trying to load a specific point in this room's timeline but ";
var message = "Tried to load a specific point in this room's timeline, but ";
if (error.errcode == 'M_FORBIDDEN') {
message += "you do not have permission to view the message in question.";
} else {

2
src/components/structures/login/Login.js
View file

@ -203,7 +203,7 @@ module.exports = React.createClass({
!this.state.enteredHomeserverUrl.startsWith("http")))
{
errorText = <span>
Can't connect to homeserver via HTTP when using Riot served by HTTPS.
Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar.
Either use HTTPS or <a href='https://www.google.com/search?&q=enable%20unsafe%20scripts'>enable unsafe scripts</a>
</span>;
}

2
src/components/views/rooms/RoomPreviewBar.js
View file

@ -94,7 +94,7 @@ module.exports = React.createClass({
if (this.props.invitedEmail) {
if (this.state.threePidFetchError) {
emailMatchBlock = <div className="error">
Riot was unable to ascertain that the address this invite was
Unable to ascertain that the address this invite was
sent to matches one associated with your account.
</div>
} else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) {