Skip to content

Commit

Permalink
Improve wording for error page
Browse files Browse the repository at this point in the history
Reorganized it a little bit
  • Loading branch information
Kolja Lampe authored and razzeee committed Aug 18, 2016
1 parent e514d87 commit 3edf879
Showing 1 changed file with 31 additions and 16 deletions.
47 changes: 31 additions & 16 deletions src/browser/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -446,29 +446,44 @@ var MattermostView = React.createClass({
});

// ErrorCode: https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h
// FIXME: need better wording in English
var ErrorView = React.createClass({
render: function() {
return (
<Grid id={ this.props.id } style={ this.props.style }>
<h1>Failed to load the URL</h1>
<p>
{ 'URL: ' }
{ this.props.errorInfo.validatedURL }
</p>
<p>
{ 'Error code: ' }
{ this.props.errorInfo.errorCode }
</p>
<p>
{ this.props.errorInfo.errorDescription }
</p>
<p>Please check below. Then, reload this window. (Ctrl+R or Command+R)</p>
<h1>Failed to load team</h1>
<p>We will try to reconnect periodically. You can also try to reload this window manually. (Ctrl+R or Command+R)</p>
<p>If that does not work, check the following:</p>
<ListGroup>
<ListGroupItem>Is your computer online?</ListGroupItem>
<ListGroupItem>Is the server alive?</ListGroupItem>
<ListGroupItem>Is the URL correct?</ListGroupItem>
<ListGroupItem>Is the team URL correct?</ListGroupItem>
<ListGroupItem>Can you reach the server via a browser?</ListGroupItem>
</ListGroup>
<Row>
<Col xs={ 4 } sm={ 2 } md={ 2 } lg={ 2 }>
{ 'URL:' }
</Col>
<Col xs={ 8 } sm={ 10 } md={ 10 } lg={ 10 }>
<a href={ this.props.errorInfo.validatedURL }>
{ this.props.errorInfo.validatedURL }
</a>
</Col>
</Row>
<Row>
<Col xs={ 4 } sm={ 2 } md={ 2 } lg={ 2 }>
{ 'Error code:' }
</Col>
<Col xs={ 8 } sm={ 10 } md={ 10 } lg={ 10 }>
{ this.props.errorInfo.errorCode }
</Col>
</Row>
<Row>
<Col xs={ 4 } sm={ 2 } md={ 2 } lg={ 2 }>
{ 'Description:' }
</Col>
<Col xs={ 8 } sm={ 10 } md={ 10 } lg={ 10 }>
{ this.props.errorInfo.errorDescription }
</Col>
</Row>
</Grid>
);
}
Expand Down

0 comments on commit 3edf879

Please sign in to comment.