From 28b2a700f075328c8c559f35aaa862660e14266d Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Sun, 28 Jul 2019 19:03:42 -0500 Subject: show which identity roars are being signed with in the composer placeholder --- .../glitch/features/compose/components/compose_form.js | 12 ++++++++++-- .../features/compose/containers/compose_form_container.js | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.js b/app/javascript/flavours/glitch/features/compose/components/compose_form.js index e8f000b1e..56bf616cc 100644 --- a/app/javascript/flavours/glitch/features/compose/components/compose_form.js +++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.js @@ -17,7 +17,12 @@ import Publisher from './publisher'; import TextareaIcons from './textarea_icons'; const messages = defineMessages({ - placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' }, + placeholder: { id: 'compose_form.placeholder', defaultMessage: 'Roar shamelessly!' }, + placeholder_as: { + id: 'compose_form.placeholder_as', + defaultMessage: "Signing as {signature}.\nRoar shamelessly!", + values: {signature: 'yourself'} + }, missingDescriptionMessage: { id: 'confirmations.missing_media_description.message', defaultMessage: 'At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.' }, missingDescriptionConfirm: { id: 'confirmations.missing_media_description.confirm', @@ -70,6 +75,7 @@ class ComposeForm extends ImmutablePureComponent { onUnmount: PropTypes.func, onPaste: PropTypes.func, onMediaDescriptionConfirm: PropTypes.func, + account: ImmutablePropTypes.map.isRequired, }; static defaultProps = { @@ -297,9 +303,11 @@ class ComposeForm extends ImmutablePureComponent { suggestions, text, spoilersAlwaysOn, + account, } = this.props; let disabledButton = isSubmitting || isUploading || isChangingUpload || (!text.trim().length && !anyMedia); + let signature = this.props.account.get('signature'); return (
@@ -331,7 +339,7 @@ class ComposeForm extends ImmutablePureComponent {