tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoiler

Browse Source
This commit is contained in:
Eugen Rochko
2018-03-13 09:18:11 +01:00
parent 9e3a6d6784 0dccb398bd
commit f0ae6b4cc5
39 changed files with 92 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
View File

@ -4,12 +4,13 @@ import { changeComposeSpoilerness } from '../../../actions/compose';
import { injectIntl, defineMessages } from 'react-intl';
const messages = defineMessages({
title: { id: 'compose_form.spoiler', defaultMessage: 'Hide text behind warning' },
marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Text is hidden behind warning' },
unmarked: { id: 'compose_form.spoiler.unmarked', defaultMessage: 'Text is not hidden' },
});
const mapStateToProps = (state, { intl }) => ({
label: 'CW',
title: intl.formatMessage(messages.title),
title: intl.formatMessage(state.getIn(['compose', 'spoiler']) ? messages.marked : messages.unmarked),
active: state.getIn(['compose', 'spoiler']),
ariaControls: 'cw-spoiler-input',
});