summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorElias Nahum <nahumhbl@gmail.com>2016-01-31 12:23:16 -0300
committerElias Nahum <nahumhbl@gmail.com>2016-01-31 12:23:16 -0300
commit5be57bc970ebe72ecae3d421e75e3e418c479bc7 (patch)
tree838aa07b7fe8441b3179d73e54b8d862f0e4b159 /web/react
parent78314c7d4d1417fd42ab48cbe41d360f80915453 (diff)
downloadchat-5be57bc970ebe72ecae3d421e75e3e418c479bc7.tar.gz
chat-5be57bc970ebe72ecae3d421e75e3e418c479bc7.tar.bz2
chat-5be57bc970ebe72ecae3d421e75e3e418c479bc7.zip
PLT-7: Refactoring frontend (chunk 7)
- Elegant way to include react Component into FormattedMessage
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/user_settings/user_settings_general.jsx20
1 files changed, 6 insertions, 14 deletions
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx
index 8052347a0..f20b4b807 100644
--- a/web/react/components/user_settings/user_settings_general.jsx
+++ b/web/react/components/user_settings/user_settings_general.jsx
@@ -385,20 +385,12 @@ class UserSettingsGeneralTab extends React.Component {
const extraInfo = (
<span>
<FormattedMessage
- id='user.settings.general.notificationsExtra1'
- defaultMessage='By default, you will receive mention notifications when someone types your first name. Go to '
- >
- {(intro) => (
- <span key='intro'>
- {intro}
- {notifLink}
- <FormattedMessage
- id='user.settings.general.notificationsExtra2'
- defaultMessage=' settings to change this default.'
- />
- </span>
- )}
- </FormattedMessage>
+ id='user.settings.general.notificationsExtra'
+ defaultMessage='By default, you will receive mention notifications when someone types your first name. Go to {notify} settings to change this default.'
+ values={{
+ notify: (notifLink)
+ }}
+ />
</span>
);