diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2022-05-16 11:18:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-16 11:18:35 +0200 |
commit | 0cdb07757050825725cac76f1c9cf11cf64acc0a (patch) | |
tree | 297332f429df3eb166f4e46da4cdcb674303d214 /app/javascript/mastodon/features/compose/components/compose_form.js | |
parent | c3fac61f56b3ad63534961f3d3c426cdf8ac6213 (diff) |
Add language dropdown to compose in web UI (#18420)
Diffstat (limited to 'app/javascript/mastodon/features/compose/components/compose_form.js')
-rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index d7635da40..4620d1c43 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -15,6 +15,7 @@ import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container'; import PollFormContainer from '../containers/poll_form_container'; import UploadFormContainer from '../containers/upload_form_container'; import WarningContainer from '../containers/warning_container'; +import LanguageDropdown from '../containers/language_dropdown_container'; import { isMobile } from '../../../is_mobile'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { length } from 'stringz'; @@ -204,6 +205,7 @@ class ComposeForm extends ImmutablePureComponent { render () { const { intl, onPaste, showSearch } = this.props; const disabled = this.props.isSubmitting; + let publishText = ''; if (this.props.isEditing) { @@ -254,6 +256,7 @@ class ComposeForm extends ImmutablePureComponent { autoFocus={!showSearch && !isMobile(window.innerWidth)} > <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} /> + <div className='compose-form__modifiers'> <UploadFormContainer /> <PollFormContainer /> @@ -266,12 +269,18 @@ class ComposeForm extends ImmutablePureComponent { <PollButtonContainer /> <PrivacyDropdownContainer disabled={this.props.isEditing} /> <SpoilerButtonContainer /> + <LanguageDropdown /> + </div> + + <div className='character-counter__wrapper'> + <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} /> </div> - <div className='character-counter__wrapper'><CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} /></div> </div> <div className='compose-form__publish'> - <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={!this.canSubmit()} block /></div> + <div className='compose-form__publish-button-wrapper'> + <Button text={publishText} onClick={this.handleSubmit} disabled={!this.canSubmit()} block /> + </div> </div> </div> ); |