Skip to content
Snippets Groups Projects
Commit ae312d5d authored by Valentine Zavgorodnev's avatar Valentine Zavgorodnev Committed by GitHub
Browse files

misc copy updates (#505)

parent 10aec5ab
No related branches found
No related tags found
No related merge requests found
...@@ -201,7 +201,7 @@ class App extends React.Component { ...@@ -201,7 +201,7 @@ class App extends React.Component {
</a> </a>
</li> </li>
<li> <li>
<a href="https://steemit.chat/home" target="_blank"> <a href="https://steemit.chat/home" target="_blank" rel="noopener noreferrer">
{translate("steemit_chat")}&nbsp;<Icon name="extlink" /> {translate("steemit_chat")}&nbsp;<Icon name="extlink" />
</a> </a>
</li> </li>
......
...@@ -23,7 +23,10 @@ class PostsList extends React.Component { ...@@ -23,7 +23,10 @@ class PostsList extends React.Component {
loading: PropTypes.bool.isRequired, loading: PropTypes.bool.isRequired,
category: PropTypes.string, category: PropTypes.string,
loadMore: PropTypes.func, loadMore: PropTypes.func,
emptyText: PropTypes.object, emptyText: PropTypes.oneOfType([
PropTypes.string,
PropTypes.node,
]),
showSpam: PropTypes.bool, showSpam: PropTypes.bool,
fetchState: PropTypes.func.isRequired, fetchState: PropTypes.func.isRequired,
pathname: PropTypes.string, pathname: PropTypes.string,
......
...@@ -156,9 +156,9 @@ class LoginForm extends Component { ...@@ -156,9 +156,9 @@ class LoginForm extends Component {
} }
} }
const standardPassword = checkPasswordChecksum(password.value) const standardPassword = checkPasswordChecksum(password.value)
const password_info = standardPassword === undefined ? null : let password_info = null
standardPassword ? 'Password checks out and appears valid.' : if (standardPassword !== undefined && !standardPassword)
'This password was probably typed or copied incorrectly.' password_info = 'This password was probably typed or copied incorrectly. A password generated by Steemit should not contain 0 (zero), O (capital o), I (capital i) and l (lower case L) characters.'
const form = ( const form = (
<form onSubmit={handleSubmit(data => { <form onSubmit={handleSubmit(data => {
...@@ -177,7 +177,7 @@ class LoginForm extends Component { ...@@ -177,7 +177,7 @@ class LoginForm extends Component {
<div> <div>
<input type="password" required ref="pw" placeholder="Password or WIF" {...password.props} autoComplete="on" disabled={submitting} /> <input type="password" required ref="pw" placeholder="Password or WIF" {...password.props} autoComplete="on" disabled={submitting} />
<div className="error">{error}&nbsp;</div> {error && <div className="error">{error}&nbsp;</div>}
{password_info && <div className="warning">{password_info}&nbsp;</div>} {password_info && <div className="warning">{password_info}&nbsp;</div>}
</div> </div>
{loginBroadcastOperation && <div> {loginBroadcastOperation && <div>
......
...@@ -6,7 +6,7 @@ import constants from 'app/redux/constants'; ...@@ -6,7 +6,7 @@ import constants from 'app/redux/constants';
import shouldComponentUpdate from 'app/utils/shouldComponentUpdate'; import shouldComponentUpdate from 'app/utils/shouldComponentUpdate';
import PostsList from 'app/components/cards/PostsList'; import PostsList from 'app/components/cards/PostsList';
import {isFetchingOrRecentlyUpdated} from 'app/utils/StateFunctions'; import {isFetchingOrRecentlyUpdated} from 'app/utils/StateFunctions';
import g from 'app/redux/GlobalReducer'; import {Link} from 'react-router';
class PostsIndex extends React.Component { class PostsIndex extends React.Component {
...@@ -15,7 +15,8 @@ class PostsIndex extends React.Component { ...@@ -15,7 +15,8 @@ class PostsIndex extends React.Component {
status: PropTypes.object, status: PropTypes.object,
routeParams: PropTypes.object, routeParams: PropTypes.object,
requestData: PropTypes.func, requestData: PropTypes.func,
loading: PropTypes.bool loading: PropTypes.bool,
current_user: PropTypes.object
}; };
static defaultProps = { static defaultProps = {
...@@ -66,7 +67,16 @@ class PostsIndex extends React.Component { ...@@ -66,7 +67,16 @@ class PostsIndex extends React.Component {
order = 'by_feed'; order = 'by_feed';
topics_order = 'trending'; topics_order = 'trending';
posts = this.props.global.getIn(['accounts', account_name, 'feed']); posts = this.props.global.getIn(['accounts', account_name, 'feed']);
emptyText = `Looks like ${account_name} hasn't followed anything yet!`; const isMyAccount = this.props.current_user && this.props.current_user.get('username') === account_name;
if (isMyAccount) {
emptyText = <div>
Looks like you haven't followed anything yet.<br />
<Link to="/trending">Explore Steemit</Link><br />
<a href="/steemit/@thecryptofiend/the-missing-faq-a-beginners-guide-to-using-steemit">Read The Beginner's Guide</a>
</div>
} else {
emptyText = `Looks like ${account_name} hasn't followed anything yet!`;
}
} else { } else {
posts = this.getPosts(order, category); posts = this.getPosts(order, category);
} }
...@@ -106,7 +116,8 @@ module.exports = { ...@@ -106,7 +116,8 @@ module.exports = {
discussions: state.global.get('discussion_idx'), discussions: state.global.get('discussion_idx'),
status: state.global.get('status'), status: state.global.get('status'),
loading: state.app.get('loading'), loading: state.app.get('loading'),
global: state.global global: state.global,
current_user: state.user.get('current')
}; };
}, },
(dispatch) => { (dispatch) => {
......
...@@ -169,7 +169,7 @@ export default class UserProfile extends React.Component { ...@@ -169,7 +169,7 @@ export default class UserProfile extends React.Component {
const emptyText = isMyAccount ? <div> const emptyText = isMyAccount ? <div>
Looks like you haven't posted anything yet.<br /> Looks like you haven't posted anything yet.<br />
<Link to="/submit.html">Submit a Story</Link><br /> <Link to="/submit.html">Submit a Story</Link><br />
<Link to="/steemit/@thecryptofiend/the-missing-faq-a-beginners-guide-to-using-steemit">Read The Beginner's Guide</Link> <a href="/steemit/@thecryptofiend/the-missing-faq-a-beginners-guide-to-using-steemit">Read The Beginner's Guide</a>
</div>: </div>:
<div>Looks like {account.name} hasn't started blogging yet!</div>; <div>Looks like {account.name} hasn't started blogging yet!</div>;
tab_content = <PostsList tab_content = <PostsList
......
...@@ -149,6 +149,10 @@ Steemit leverages Steem because the founders of Steemit believe Steem’s decent ...@@ -149,6 +149,10 @@ Steemit leverages Steem because the founders of Steemit believe Steem’s decent
Users holding Steem Power can vote for witnesses of their choice by visiting this link. https://steemit.com/~witnesses Users holding Steem Power can vote for witnesses of their choice by visiting this link. https://steemit.com/~witnesses
## How do I report a security vulnerability?
If you find a security issue please report details to security@steemit.com.
## Where can I find more information on Steemit? ## Where can I find more information on Steemit?
### Links to Community Created FAQs ### Links to Community Created FAQs
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment