ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #327 from TazeTSchnitzel/clearer_unlisted 

Replace “Unlisted mode” with “Do not show on public timeline”
rebase/4.0.0rc2
Eugen 2016-12-01 20:58:00 +01:00 committed by GitHub
parent fe65acd414 fd01f13b3c
commit 2b2797d6a5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/features/compose/components/compose_form.jsx
View File

@ -195,7 +195,7 @@ const ComposeForm = React.createClass({
<label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle', marginTop: '10px', borderTop: '1px solid #282c37', paddingTop: '10px' }}> <label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle', marginTop: '10px', borderTop: '1px solid #282c37', paddingTop: '10px' }}>
<Toggle checked={this.props.unlisted} onChange={this.handleChangeVisibility} /> <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>
<label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle' }}> <label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle' }}>

2
app/assets/javascripts/components/locales/en.jsx
View File

@ -38,7 +38,7 @@ const en = {
"compose_form.placeholder": "What is on your mind?", "compose_form.placeholder": "What is on your mind?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.sensitive": "Mark content as sensitive", "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.settings": "Settings",
"navigation_bar.public_timeline": "Public timeline", "navigation_bar.public_timeline": "Public timeline",
"navigation_bar.logout": "Logout", "navigation_bar.logout": "Logout",