logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 2b2797d6a5902af63c3362b5abca03578f567761
parent: fe65acd4142373925accf05456bc68dd16674e79
Author: Eugen <eugen@zeonfederated.com>
Date:   Thu,  1 Dec 2016 20:58:00 +0100

Merge pull request #327 from TazeTSchnitzel/clearer_unlisted

Replace “Unlisted mode” with “Do not show on public timeline”

Diffstat:

Mapp/assets/javascripts/components/features/compose/components/compose_form.jsx2+-
Mapp/assets/javascripts/components/locales/en.jsx2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx @@ -195,7 +195,7 @@ const ComposeForm = React.createClass({ <label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle', marginTop: '10px', borderTop: '1px solid #282c37', paddingTop: '10px' }}> <Toggle checked={this.props.unlisted} onChange={this.handleChangeVisibility} /> - <span style={{ display: 'inline-block', verticalAlign: 'middle', marginBottom: '14px', marginLeft: '8px', color: '#9baec8' }}><FormattedMessage id='compose_form.unlisted' defaultMessage='Unlisted mode' /></span> + <span style={{ display: 'inline-block', verticalAlign: 'middle', marginBottom: '14px', marginLeft: '8px', color: '#9baec8' }}><FormattedMessage id='compose_form.unlisted' defaultMessage='Do not show on public timeline' /></span> </label> <label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle' }}> diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx @@ -38,7 +38,7 @@ const en = { "compose_form.placeholder": "What is on your mind?", "compose_form.publish": "Toot", "compose_form.sensitive": "Mark content as sensitive", - "compose_form.unlisted": "Unlisted mode", + "compose_form.unlisted": "Do not show on public timeline", "navigation_bar.settings": "Settings", "navigation_bar.public_timeline": "Public timeline", "navigation_bar.logout": "Logout",