PLT-7: Refactoring frontend (chunk 7)

- Elegant way to include react Component into FormattedMessage

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>
             );
 

web/static/i18n/en.json

@@ -777,8 +777,7 @@
   "user.settings.general.firstName": "First Name",
   "user.settings.general.lastName": "Last Name",
   "user.settings.general.notificationsLink": "Notifications",
-  "user.settings.general.notificationsExtra1": "By default, you will receive mention notifications when someone types your first name. Go to ",
-  "user.settings.general.notificationsExtra2": " settings to change this default.",
+  "user.settings.general.notificationsExtra": "By default, you will receive mention notifications when someone types your first name. Go to {notify} settings to change this default.",
   "user.settings.general.nicknameExtra": "Use Nickname for a name you might be called that is different from your first name and username. This is most often used when two or more people have similar sounding names and usernames.",
   "user.settings.general.usernameInfo": "Pick something easy for teammates to recognize and recall.",
   "user.settings.general.emailHelp1": "Email is used for sign-in, notifications, and password reset. Email requires verification if changed.",

web/static/i18n/es.json

@@ -748,8 +748,7 @@
   "user.settings.general.newAddress": "Nueva dirección: {email}<br />Revisa tu correo electrónico para verificar tu nueva dirección.",
   "user.settings.general.nickname": "Sobrenombre",
   "user.settings.general.nicknameExtra": "Utiliza un Sobrenombre por el cual te conocen que sea diferente de tu nombre y del nombre de tu usuario. Esto se utiliza con mayor frecuencia cuando dos o más personas tienen nombres y nombres de usuario que suenan similares.",
-  "user.settings.general.notificationsExtra1": "De forma predeterminada, recibirás notificaciones cuando alguien escribe tu nombre. Ve a la configuración de ",
-  "user.settings.general.notificationsExtra2": " para cambiar este comportamiento.",
+  "user.settings.general.notificationsExtra": "De forma predeterminada, recibirás notificaciones cuando alguien escribe tu nombre. Ve a la configuración de {notify} para cambiar este comportamiento.",
   "user.settings.general.notificationsLink": "Notificaciones",
   "user.settings.general.primaryEmail": "Correo Principal",
   "user.settings.general.profilePicture": "Foto del Perfil",