From 2bb54d5c573a9783fb5cd36202ef548b23494daa Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Wed, 19 Apr 2017 20:20:04 +0800 Subject: [PATCH] Update title text for "reply all" button (#2118) --- .../components/components/status_action_bar.jsx | 12 +++++++++++- app/assets/javascripts/components/locales/en.jsx | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/components/components/status_action_bar.jsx b/app/assets/javascripts/components/components/status_action_bar.jsx index 1b38caa40b..213aa7743b 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 (
-
+
diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx index 5c12385245..96781166e8 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",