diff options
| author | Misty De Meo <mistydemeo@github.com> | 2017-04-19 20:20:04 +0800 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-19 14:20:04 +0200 |
| commit | 2bb54d5c573a9783fb5cd36202ef548b23494daa (patch) | |
| tree | bb804f4b565d77976a76a084e3b4bd3a1ef21e24 /app/assets | |
| parent | 8b8e140c7155a94efd2b72d43d18c478a10f3582 (diff) | |
Update title text for "reply all" button (#2118)
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/components/components/status_action_bar.jsx | 12 | ||||
| -rw-r--r-- | app/assets/javascripts/components/locales/en.jsx | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/components/status_action_bar.jsx b/app/assets/javascripts/components/components/status_action_bar.jsx index 1b38caa40..213aa7743 100644 --- a/app/assets/javascripts/components/components/status_action_bar.jsx +++ b/app/assets/javascripts/components/components/status_action_bar.jsx @@ -10,6 +10,7 @@ const messages = defineMessages({ mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' }, block: { id: 'account.block', defaultMessage: 'Block @{name}' }, reply: { id: 'status.reply', defaultMessage: 'Reply' }, + replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' }, reblog: { id: 'status.reblog', defaultMessage: 'Reblog' }, favourite: { id: 'status.favourite', defaultMessage: 'Favourite' }, open: { id: 'status.open', defaultMessage: 'Expand this status' }, @@ -95,10 +96,19 @@ const StatusActionBar = React.createClass({ let reblogIcon = 'retweet'; if (status.get('visibility') === 'direct') reblogIcon = 'envelope'; else if (status.get('visibility') === 'private') reblogIcon = 'lock'; + let reply_icon; + let reply_title; + if (status.get('in_reply_to_id', null) === null) { + reply_icon = "reply"; + reply_title = intl.formatMessage(messages.reply); + } else { + reply_icon = "reply-all"; + reply_title = intl.formatMessage(messages.replyAll); + } return ( <div style={{ marginTop: '10px', overflow: 'hidden' }}> - <div style={{ float: 'left', marginRight: '18px'}}><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_id', null) === null ? 'reply' : 'reply-all'} onClick={this.handleReplyClick} /></div> + <div style={{ float: 'left', marginRight: '18px'}}><IconButton title={reply_title} icon={reply_icon} onClick={this.handleReplyClick} /></div> <div style={{ float: 'left', marginRight: '18px'}}><IconButton disabled={status.get('visibility') === 'private' || status.get('visibility') === 'direct'} active={status.get('reblogged')} title={intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /></div> <div style={{ float: 'left', marginRight: '18px'}}><IconButton animate={true} active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} activeStyle={{ color: '#ca8f04' }} /></div> diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx index 5c1238524..96781166e 100644 --- a/app/assets/javascripts/components/locales/en.jsx +++ b/app/assets/javascripts/components/locales/en.jsx @@ -112,6 +112,7 @@ const en = { "status.reblog": "Boost", "status.reblogged_by": "{name} boosted", "status.reply": "Reply", + "status.replyAll": "Reply to thread", "status.report": "Report @{name}", "status.sensitive_toggle": "Click to view", "status.sensitive_warning": "Sensitive content", |