diff options
| author | Ashley <expenses@airmail.cc> | 2017-04-22 13:36:33 +1200 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-22 03:36:33 +0200 |
| commit | 6af21daac9f5ed3932694b211a04a715a348d995 (patch) | |
| tree | 4ad1422ae559e889e31dccf54f0ef121d698d866 /app | |
| parent | 9d3be5579a07bbff182b40cf15c04f762f155e51 (diff) | |
Allowed the emoji picker 'Search...' string to be localized (#2294)
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/components/locales/en.jsx | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx b/app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx index 77117b7e4..572a55982 100644 --- a/app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx +++ b/app/assets/javascripts/components/features/compose/components/emoji_picker_dropdown.jsx @@ -4,7 +4,8 @@ import PropTypes from 'prop-types'; import { defineMessages, injectIntl } from 'react-intl'; const messages = defineMessages({ - emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' } + emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' }, + emoji_search: { id: 'emoji_button.search', defaultMessage: 'Search...' } }); const settings = { @@ -46,7 +47,7 @@ class EmojiPickerDropdown extends React.PureComponent { </DropdownTrigger> <DropdownContent className='dropdown__left light'> - <EmojiPicker emojione={settings} onChange={this.handleChange} search={true} /> + <EmojiPicker emojione={settings} onChange={this.handleChange} searchPlaceholder={intl.formatMessage(messages.emoji_search)} search={true} /> </DropdownContent> </Dropdown> ); diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx index 4446bb5f7..b3e3273bf 100644 --- a/app/assets/javascripts/components/locales/en.jsx +++ b/app/assets/javascripts/components/locales/en.jsx @@ -41,6 +41,7 @@ const en = { "compose_form.spoiler_placeholder": "Content warning", "compose_form.spoiler": "Hide text behind warning", "emoji_button.label": "Insert emoji", + "emoji_button.search": "Search...", "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!", "empty_column.hashtag": "There is nothing in this hashtag yet.", "empty_column.home.public_timeline": "the public timeline", |