about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/compose/containers/warning_container.js
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-05-19 18:37:33 +0200
committerGitHub <noreply@github.com>2018-05-19 18:37:33 +0200
commit1bbe12254d450aadf343ea337287f5e4b6ce5e80 (patch)
tree913e5f599914b27f4fe23ef3573f015cdfb5e996 /app/javascript/mastodon/features/compose/containers/warning_container.js
parent93c66f0c03c27ee02b9875c3c051d9bf50b33e19 (diff)
Improve direct message warning again (#7546)
Diffstat (limited to 'app/javascript/mastodon/features/compose/containers/warning_container.js')
-rw-r--r--app/javascript/mastodon/features/compose/containers/warning_container.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/containers/warning_container.js b/app/javascript/mastodon/features/compose/containers/warning_container.js
index 88f816da4..8200a319f 100644
--- a/app/javascript/mastodon/features/compose/containers/warning_container.js
+++ b/app/javascript/mastodon/features/compose/containers/warning_container.js
@@ -17,11 +17,19 @@ const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning
   if (needsLockWarning) {
     return <Warning message={<FormattedMessage id='compose_form.lock_disclaimer' defaultMessage='Your account is not {locked}. Anyone can follow you to view your follower-only posts.' values={{ locked: <a href='/settings/profile'><FormattedMessage id='compose_form.lock_disclaimer.lock' defaultMessage='locked' /></a> }} />} />;
   }
+
   if (hashtagWarning) {
     return <Warning message={<FormattedMessage id='compose_form.hashtag_warning' defaultMessage="This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag." />} />;
   }
+
   if (directMessageWarning) {
-    return <Warning message={<FormattedMessage id='compose_form.direct_message_warning' defaultMessage='This toot will only be sent to all the mentioned users. However, the operators of your instance and any receiving instances may see this message.' />} />;
+    const message = (
+      <span>
+        <FormattedMessage id='compose_form.direct_message_warning' defaultMessage='This toot will only be sent to all the mentioned users.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a>
+      </span>
+    );
+
+    return <Warning message={message} />;
   }
 
   return null;