marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use identity nickname in composer placeholder instead (custom emoji won't work in placeholder text)

staging
multiple creatures 2019-07-28 19:33:31 -05:00
parent 30d3b9a6f7
commit b93bf4b271
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/flavours/glitch/features/compose/components/compose_form.js
View File

@ -20,8 +20,8 @@ const messages = defineMessages({
placeholder: { id: 'compose_form.placeholder', defaultMessage: 'Roar shamelessly!' },
placeholder_as: {
id: 'compose_form.placeholder_as',
defaultMessage: "Signing as {signature}.\nRoar shamelessly!",
values: {signature: 'yourself'}
defaultMessage: "Signing as {nickname}.\nRoar shamelessly!",
values: {nickname: '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.' },
@ -307,7 +307,7 @@ class ComposeForm extends ImmutablePureComponent {
} = this.props;
let disabledButton = isSubmitting || isUploading || isChangingUpload || (!text.trim().length && !anyMedia);
let signature = this.props.account.get('signature');
let nickname = this.props.account.get('identity');
return (
<div className='composer'>
@ -339,7 +339,7 @@ class ComposeForm extends ImmutablePureComponent {
<AutosuggestTextarea
ref={this.setAutosuggestTextarea}
placeholder={signature ? intl.formatMessage(messages.placeholder_as, {signature: signature}) : intl.formatMessage(messages.placeholder)}
placeholder={nickname ? intl.formatMessage(messages.placeholder_as, {nickname: nickname}) : intl.formatMessage(messages.placeholder)}
disabled={isSubmitting}
value={this.props.text}
onChange={this.handleChange}