Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unbranded error messages

Browse Source
This commit is contained in:
Daniel Dent 2016-12-21 14:25:46 -08:00
parent 4804fb3a1c
commit 7c841a86ef
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"); var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
Modal.createDialog(QuestionDialog, { Modal.createDialog(QuestionDialog, {
title: "Warning!", 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=>{ onFinished: confirm=>{
if (confirm) { if (confirm) {
ConferenceHandler.createNewMatrixCall( 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') { if (error.errcode == 'M_FORBIDDEN') {
message += "you do not have permission to view the message in question."; message += "you do not have permission to view the message in question.";
} else { } else {

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

@ -203,7 +203,7 @@ module.exports = React.createClass({
!this.state.enteredHomeserverUrl.startsWith("http"))) !this.state.enteredHomeserverUrl.startsWith("http")))
{ {
errorText = <span> 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> Either use HTTPS or <a href='https://www.google.com/search?&q=enable%20unsafe%20scripts'>enable unsafe scripts</a>
</span>; </span>;
} }

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

@ -94,7 +94,7 @@ module.exports = React.createClass({
if (this.props.invitedEmail) { if (this.props.invitedEmail) {
if (this.state.threePidFetchError) { if (this.state.threePidFetchError) {
emailMatchBlock = <div className="error"> 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. sent to matches one associated with your account.
</div> </div>
} else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) { } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) {