From be0a01145b5f303c5c506858146ccf6c6d5cee72 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Thu, 27 Apr 2017 19:03:28 +0900
Subject: Sync a locale files for JavaScript (#2513)

There are multiple messages missing in en.jsx.
It is very troublesome when translating other languages.
---
 .../components/features/compose/containers/spoiler_button_container.jsx | 2 +-
 .../components/features/compose/containers/warning_container.jsx        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts/components/features/compose')

diff --git a/app/assets/javascripts/components/features/compose/containers/spoiler_button_container.jsx b/app/assets/javascripts/components/features/compose/containers/spoiler_button_container.jsx
index c54904b60..b1c80fe19 100644
--- a/app/assets/javascripts/components/features/compose/containers/spoiler_button_container.jsx
+++ b/app/assets/javascripts/components/features/compose/containers/spoiler_button_container.jsx
@@ -4,7 +4,7 @@ import { changeComposeSpoilerness } from '../../../actions/compose';
 import { injectIntl, defineMessages } from 'react-intl';
 
 const messages = defineMessages({
-  title: { id: 'compose_form.spoiler', defaultMessage: 'Hide text behind content warning' }
+  title: { id: 'compose_form.spoiler', defaultMessage: 'Hide text behind warning' }
 });
 
 const mapStateToProps = (state, { intl }) => ({
diff --git a/app/assets/javascripts/components/features/compose/containers/warning_container.jsx b/app/assets/javascripts/components/features/compose/containers/warning_container.jsx
index 62a9bb571..cd744ed82 100644
--- a/app/assets/javascripts/components/features/compose/containers/warning_container.jsx
+++ b/app/assets/javascripts/components/features/compose/containers/warning_container.jsx
@@ -29,7 +29,7 @@ const WarningWrapper = ({ needsLeakWarning, needsLockWarning, mentionedDomains }
       <Warning
         message={<FormattedMessage
           id='compose_form.privacy_disclaimer'
-          defaultMessage='Your private status will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}} to not leak your status?'
+          defaultMessage='Your private status will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}}? Post privacy only works on Mastodon instances. If {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, there will be no indication that your post is private, and it may be boosted or otherwise made visible to unintended recipients.'
           values={{ domains: <strong>{mentionedDomains.join(', ')}</strong>, domainsCount: mentionedDomains.length }}
         />}
       />
-- 
cgit